Revert 271798 "[Metrics] Make MetricsStateManager take a callbac..."

trunk/src/chrome/browser/metrics/metrics_service_unittest.cc

Index: trunk/src/chrome/browser/metrics/metrics_service_unittest.cc
===================================================================
--- trunk/src/chrome/browser/metrics/metrics_service_unittest.cc	(revision 271821)
+++ trunk/src/chrome/browser/metrics/metrics_service_unittest.cc	(working copy)
@@ -6,9 +6,10 @@
 
 #include <string>
 
-#include "base/bind.h"
+#include "base/command_line.h"
 #include "base/threading/platform_thread.h"
 #include "chrome/browser/metrics/metrics_state_manager.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/testing_browser_process.h"
@@ -89,12 +90,8 @@
  public:
   MetricsServiceTest()
       : testing_local_state_(TestingBrowserProcess::GetGlobal()),
-        is_metrics_reporting_enabled_(false),
-        metrics_state_manager_(
-            metrics::MetricsStateManager::Create(
-                GetLocalState(),
-                base::Bind(&MetricsServiceTest::is_metrics_reporting_enabled,
-                           base::Unretained(this)))) {
+        metrics_state_manager_(metrics::MetricsStateManager::Create(
+            GetLocalState())) {
   }
 
   virtual ~MetricsServiceTest() {
@@ -111,7 +108,9 @@
 
   // Sets metrics reporting as enabled for testing.
   void EnableMetricsReporting() {
-    is_metrics_reporting_enabled_ = true;
+    // TODO(asvitkine): Refactor the code to not need this flag and delete it.
+    CommandLine::ForCurrentProcess()->AppendSwitch(
+        switches::kEnableMetricsReportingForTesting);
   }
 
   // Waits until base::TimeTicks::Now() no longer equals |value|. This should
@@ -140,13 +139,8 @@
   }
 
  private:
-  bool is_metrics_reporting_enabled() const {
-    return is_metrics_reporting_enabled_;
-  }
-
   content::TestBrowserThreadBundle thread_bundle_;
   ScopedTestingLocalState testing_local_state_;
-  bool is_metrics_reporting_enabled_;
   scoped_ptr<metrics::MetricsStateManager> metrics_state_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MetricsServiceTest);