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

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

Index: trunk/src/chrome/browser/metrics/metrics_state_manager_unittest.cc
===================================================================
--- trunk/src/chrome/browser/metrics/metrics_state_manager_unittest.cc	(revision 271821)
+++ trunk/src/chrome/browser/metrics/metrics_state_manager_unittest.cc	(working copy)
@@ -7,7 +7,6 @@
 #include <ctype.h>
 #include <string>
 
-#include "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/testing_pref_service.h"
 #include "chrome/common/chrome_switches.h"
@@ -20,32 +19,18 @@
 
 class MetricsStateManagerTest : public testing::Test {
  public:
-  MetricsStateManagerTest() : is_metrics_reporting_enabled_(false) {
+  MetricsStateManagerTest() {
     MetricsStateManager::RegisterPrefs(prefs_.registry());
   }
 
   scoped_ptr<MetricsStateManager> CreateStateManager() {
-    return MetricsStateManager::Create(
-        &prefs_,
-        base::Bind(&MetricsStateManagerTest::is_metrics_reporting_enabled,
-                   base::Unretained(this))).Pass();
+    return MetricsStateManager::Create(&prefs_).Pass();
   }
 
-  // Sets metrics reporting as enabled for testing.
-  void EnableMetricsReporting() {
-    is_metrics_reporting_enabled_ = true;
-  }
-
  protected:
   TestingPrefServiceSimple prefs_;
 
  private:
-  bool is_metrics_reporting_enabled() const {
-    return is_metrics_reporting_enabled_;
-  }
-
-  bool is_metrics_reporting_enabled_;
-
   DISALLOW_COPY_AND_ASSIGN(MetricsStateManagerTest);
 };
 
@@ -74,7 +59,9 @@
 }
 
 TEST_F(MetricsStateManagerTest, EntropySourceUsed_High) {
-  EnableMetricsReporting();
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kEnableMetricsReportingForTesting);
+
   scoped_ptr<MetricsStateManager> state_manager(CreateStateManager());
   state_manager->CreateEntropyProvider();
   EXPECT_EQ(MetricsStateManager::ENTROPY_SOURCE_HIGH,