Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/prefs/pref_notifier_impl_unittest.cc

 // Copyright (c) 2011 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/callback.h"
 #include "base/prefs/pref_observer.h"
 #include "chrome/browser/prefs/mock_pref_change_callback.h"
 #include "chrome/browser/prefs/pref_notifier_impl.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/common/chrome_notification_types.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::_;
 using testing::Field;
 using testing::Invoke;
@@ skipping 66 matching lines @@
               const Value* value) {
     EXPECT_CALL(*this, OnPreferenceChanged(prefs, pref_name))
         .With(PrefValueMatches(prefs, pref_name, value));
   }
 };
 
 // Test fixture class.
 class PrefNotifierTest : public testing::Test {
  protected:
   virtual void SetUp() {
-    pref_service_.RegisterBooleanPref(kChangedPref,
-                                      true);
-    pref_service_.RegisterBooleanPref(kUnchangedPref,
-                                      true);
+    pref_service_.registry()->RegisterBooleanPref(kChangedPref, true);
+    pref_service_.registry()->RegisterBooleanPref(kUnchangedPref, true);
   }
 
   TestingPrefServiceSimple pref_service_;
 
   PrefObserverMock obs1_;
   PrefObserverMock obs2_;
 };
 
 TEST_F(PrefNotifierTest, OnPreferenceChanged) {
   MockPrefNotifier notifier(&pref_service_);
@@ skipping 110 matching lines @@
   EXPECT_CALL(obs2_, OnPreferenceChanged(&pref_service_, kChangedPref));
   notifier.OnPreferenceChanged(kChangedPref);
   Mock::VerifyAndClearExpectations(&obs1_);
   Mock::VerifyAndClearExpectations(&obs2_);
 
   notifier.RemovePrefObserver(kChangedPref, &obs2_);
   notifier.RemovePrefObserver(kUnchangedPref, &obs2_);
 }
 
 }  // namespace