Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/metrics/metrics_log_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/basictypes.h"
 #include "base/port.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/tracked_objects.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/metrics/metrics_log.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/common/metrics/proto/profiler_event.pb.h"
 #include "chrome/common/metrics/proto/system_profile.pb.h"
+#include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/size.h"
 #include "webkit/plugins/webplugininfo.h"
 
 using base::TimeDelta;
 using metrics::ProfilerEventProto;
@@ skipping 13 matching lines @@
   {37, 43},
   {13, 47},
   {23, 17}
 };
 
 class TestMetricsLog : public MetricsLog {
  public:
   TestMetricsLog(const std::string& client_id, int session_id)
       : MetricsLog(client_id, session_id),
         brand_for_testing_(kBrandForTesting) {
-    chrome::RegisterLocalState(&prefs_);
+          chrome::RegisterLocalState(prefs_.registry(), &prefs_);
 
 #if defined(OS_CHROMEOS)
     prefs_.SetInteger(prefs::kStabilityChildProcessCrashCount, 10);
     prefs_.SetInteger(prefs::kStabilityOtherUserCrashCount, 11);
     prefs_.SetInteger(prefs::kStabilityKernelCrashCount, 12);
     prefs_.SetInteger(prefs::kStabilitySystemUncleanShutdownCount, 13);
 #endif  // OS_CHROMEOS
   }
   virtual ~TestMetricsLog() {}
 
@@ skipping 250 matching lines @@
   EXPECT_NE(std::string::npos,
             encoded.find(" childprocesscrashcount=\"10\""));
   EXPECT_EQ(std::string::npos,
             encoded.find(" otherusercrashcount="));
   EXPECT_EQ(std::string::npos,
             encoded.find(" kernelcrashcount="));
   EXPECT_EQ(std::string::npos,
             encoded.find(" systemuncleanshutdowns="));
 }
 #endif  // OS_CHROMEOS