Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/prefs/pref_service_unittest.cc

Index: chrome/browser/prefs/pref_service_unittest.cc
diff --git a/chrome/browser/prefs/pref_service_unittest.cc b/chrome/browser/prefs/pref_service_unittest.cc
index 27dfa7dad536a3b72674f4d6e3b960eef7d3c757..395f9a4133fba51c6cd6d7ffcde8c62787d97dcb 100644
--- a/chrome/browser/prefs/pref_service_unittest.cc
+++ b/chrome/browser/prefs/pref_service_unittest.cc
@@ -44,7 +44,7 @@ TEST(PrefServiceTest, NoObserverFire) {
   TestingPrefServiceSimple prefs;
 
   const char pref_name[] = "homepage";
-  prefs.RegisterStringPref(pref_name, std::string());
+  prefs.registrar()->RegisterStringPref(pref_name, std::string());
 
   const char new_pref_value[] = "http://www.google.com/";
   MockPrefChangeCallback obs(&prefs);
@@ -86,7 +86,7 @@ TEST(PrefServiceTest, HasPrefPath) {
 
   // Register the path. This doesn't set a value, so the path still shouldn't
   // exist.
-  prefs.RegisterStringPref(path, std::string());
+  prefs.registrar()->RegisterStringPref(path, std::string());
   EXPECT_FALSE(prefs.HasPrefPath(path));
 
   // Set a value and make sure we have a path.
@@ -99,7 +99,7 @@ TEST(PrefServiceTest, Observers) {
 
   TestingPrefServiceSimple prefs;
   prefs.SetUserPref(pref_name, Value::CreateStringValue("http://www.cnn.com"));
-  prefs.RegisterStringPref(pref_name, std::string());
+  prefs.registrar()->RegisterStringPref(pref_name, std::string());
 
   const char new_pref_value[] = "http://www.google.com/";
   const StringValue expected_new_pref_value(new_pref_value);
@@ -153,7 +153,8 @@ TEST(PrefServiceTest, Observers) {
 TEST(PrefServiceTest, GetValueChangedType) {
   const int kTestValue = 10;
   TestingPrefServiceSimple prefs;
-  prefs.RegisterIntegerPref(prefs::kStabilityLaunchCount, kTestValue);
+  prefs.registrar()->RegisterIntegerPref(
+      prefs::kStabilityLaunchCount, kTestValue);
 
   // Check falling back to a recommended value.
   prefs.SetUserPref(prefs::kStabilityLaunchCount,
@@ -171,7 +172,7 @@ TEST(PrefServiceTest, GetValueChangedType) {
 
 TEST(PrefServiceTest, UpdateCommandLinePrefStore) {
   TestingPrefServiceSimple prefs;
-  prefs.RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, false);
+  prefs.registrar()->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, false);
 
   // Check to make sure the value is as expected.
   const PrefService::Preference* pref =
@@ -205,7 +206,8 @@ TEST(PrefServiceTest, GetValueAndGetRecommendedValue) {
   const int kUserValue = 10;
   const int kRecommendedValue = 15;
   TestingPrefServiceSimple prefs;
-  prefs.RegisterIntegerPref(prefs::kStabilityLaunchCount, kDefaultValue);
+  prefs.registrar()->RegisterIntegerPref(
+      prefs::kStabilityLaunchCount, kDefaultValue);
 
   // Create pref with a default value only.
   const PrefService::Preference* pref =
@@ -373,7 +375,7 @@ const char PrefServiceSetValueTest::kValue[] = "value";
 TEST_F(PrefServiceSetValueTest, SetStringValue) {
   const char default_string[] = "default";
   const StringValue default_value(default_string);
-  prefs_.RegisterStringPref(kName, default_string);
+  prefs_.registrar()->RegisterStringPref(kName, default_string);
 
   PrefChangeRegistrar registrar;
   registrar.Init(&prefs_);
@@ -395,7 +397,7 @@ TEST_F(PrefServiceSetValueTest, SetStringValue) {
 }
 
 TEST_F(PrefServiceSetValueTest, SetDictionaryValue) {
-  prefs_.RegisterDictionaryPref(kName);
+  prefs_.registrar()->RegisterDictionaryPref(kName);
   PrefChangeRegistrar registrar;
   registrar.Init(&prefs_);
   registrar.Add(kName, observer_.GetCallback());
@@ -421,7 +423,7 @@ TEST_F(PrefServiceSetValueTest, SetDictionaryValue) {
 }
 
 TEST_F(PrefServiceSetValueTest, SetListValue) {
-  prefs_.RegisterListPref(kName);
+  prefs_.registrar()->RegisterListPref(kName);
   PrefChangeRegistrar registrar;
   registrar.Init(&prefs_);
   registrar.Add(kName, observer_.GetCallback());