Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

base/prefs/public/pref_change_registrar_unittest.cc

 // Copyright (c) 2010 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/prefs/pref_observer.h"
 #include "base/prefs/public/pref_change_registrar.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::Mock;
 using testing::Eq;
 
 namespace base {
 namespace {
 
@@ skipping 102 matching lines @@
 
   // Explicitly check the expectations now to make sure that the RemoveAll
   // worked (rather than the registrar destructor doing the work).
   Mock::VerifyAndClearExpectations(service());
 }
 
 class ObserveSetOfPreferencesTest : public testing::Test {
  public:
   virtual void SetUp() {
     pref_service_.reset(new TestingPrefServiceSimple);
-    pref_service_->RegisterStringPref(kHomePage, "http://google.com");
-    pref_service_->RegisterBooleanPref(kHomePageIsNewTabPage, false);
-    pref_service_->RegisterStringPref(kApplicationLocale, "");
+    PrefRegistrySimple* registry = pref_service_->registry();
+    registry->RegisterStringPref(kHomePage, "http://google.com");
+    registry->RegisterBooleanPref(kHomePageIsNewTabPage, false);
+    registry->RegisterStringPref(kApplicationLocale, "");
   }
 
   PrefChangeRegistrar* CreatePrefChangeRegistrar() {
     PrefChangeRegistrar* pref_set = new PrefChangeRegistrar();
     base::Closure callback = base::Bind(&base::DoNothing);
     pref_set->Init(pref_service_.get());
     pref_set->Add(kHomePage, callback);
     pref_set->Add(kHomePageIsNewTabPage, callback);
     return pref_set;
   }
@@ skipping 45 matching lines @@
   pref_service_->SetUserPref(kHomePageIsNewTabPage,
                              new FundamentalValue(true));
   Mock::VerifyAndClearExpectations(this);
 
   EXPECT_CALL(*this, OnPreferenceChanged(_)).Times(0);
   pref_service_->SetUserPref(kApplicationLocale, new StringValue("en_US.utf8"));
   Mock::VerifyAndClearExpectations(this);
 }
 
 }  // namespace base