Revert 268232 "Refactor MetricsStateManager class out of Metrics..."

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/metrics/cloned_install_detector.h"
 
 #include "base/prefs/testing_pref_service.h"
 #include "chrome/browser/metrics/machine_id_provider.h"
-#include "chrome/browser/metrics/metrics_state_manager.h"
+#include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/common/pref_names.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace metrics {
 
 namespace {
 
 const std::string kTestRawId = "test";
 // Hashed machine id for |kTestRawId|.
 const int kTestHashedId = 2216819;
@@ skipping 10 matching lines @@
   scoped_ptr<ClonedInstallDetector> detector(
       new ClonedInstallDetector(MachineIdProvider::CreateInstance()));
 
   detector->SaveMachineId(&prefs, kTestRawId);
 
   EXPECT_EQ(kTestHashedId, prefs.GetInteger(prefs::kMetricsMachineId));
 }
 
 TEST(ClonedInstallDetectorTest, DetectClone) {
   TestingPrefServiceSimple prefs;
-  MetricsStateManager::RegisterPrefs(prefs.registry());
+  ClonedInstallDetector::RegisterPrefs(prefs.registry());
+  MetricsService::RegisterPrefs(prefs.registry());
 
   // Save a machine id that will cause a clone to be detected.
   prefs.SetInteger(prefs::kMetricsMachineId, kTestHashedId + 1);
 
   scoped_ptr<ClonedInstallDetector> detector(
       new ClonedInstallDetector(MachineIdProvider::CreateInstance()));
 
   detector->SaveMachineId(&prefs, kTestRawId);
 
   EXPECT_TRUE(prefs.GetBoolean(prefs::kMetricsResetIds));
 }
 
 }  // namespace metrics