commit 5273d502b829239b67531d1c5fd25876ff604387
author Bertrand Simonnet <bsimonnet@google.com> Tue Sep 22 21:35:06 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 22 21:35:06 2015 +0000
tree 4242049b6ac8fd7e4e4125b2b5d39fe273955de0
parent b0d84d16ffeabd3aa1b9d9ecf48110ff4f8508e7
parent 216442e61b667f041f35af8080c7a3625e50f122

am 216442e6: Merge "metricsd: Fix unit tests."

* commit '216442e61b667f041f35af8080c7a3625e50f122':
  metricsd: Fix unit tests.

metricsd/metrics_daemon_test.cc

diff --git a/metricsd/metrics_daemon_test.cc b/metricsd/metrics_daemon_test.cc
index 476d0f3..1adf9de 100644
--- a/metricsd/metrics_daemon_test.cc
+++ b/metricsd/metrics_daemon_test.cc
@@ -25,6 +25,7 @@
 #include <base/files/scoped_temp_dir.h>
 #include <base/strings/string_number_conversions.h>
 #include <base/strings/stringprintf.h>
+#include <chromeos/flag_helper.h>
 #include <gtest/gtest.h>
 
 #include "constants.h"
@@ -60,6 +61,7 @@
   std::string kFakeDiskStats1;
 
   virtual void SetUp() {
+    chromeos::FlagHelper::Init(0, nullptr, "");
     EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
     scaling_max_freq_path_ = temp_dir_.path().Append("scaling_max");
     cpu_max_freq_path_ = temp_dir_.path().Append("cpu_freq_max");