Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/test/base/testing_pref_service.h

 // 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.
 
 #ifndef CHROME_TEST_BASE_TESTING_PREF_SERVICE_H_
 #define CHROME_TEST_BASE_TESTING_PREF_SERVICE_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/prefs/testing_pref_store.h"
+#include "chrome/browser/prefs/pref_registrar_simple.h"
 #include "chrome/browser/prefs/pref_service.h"
 
 class DefaultPrefStore;
 class PrefModelAssociator;
 class PrefNotifierImpl;
 class TestingBrowserProcess;
 class TestingPrefStore;
 
 // A PrefService subclass for testing. It operates totally in memory and
 // provides additional API for manipulating preferences at the different levels
@@ skipping 48 matching lines @@
   void RemovePref(TestingPrefStore* pref_store, const char* path);
 
   // Pointers to the pref stores our value store uses.
   scoped_refptr<TestingPrefStore> managed_prefs_;
   scoped_refptr<TestingPrefStore> user_prefs_;
   scoped_refptr<TestingPrefStore> recommended_prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingPrefServiceBase);
 };
 
-// Test version of PrefServiceSimple.
+// Test version of PrefService.
 class TestingPrefServiceSimple
-    : public TestingPrefServiceBase<PrefServiceSimple> {
+    : public TestingPrefServiceBase<PrefService> {
  public:
   TestingPrefServiceSimple();
   virtual ~TestingPrefServiceSimple();
 
+  PrefRegistrarSimple* registrar() { return &registrar_; }
+
  private:
+  PrefRegistrarSimple registrar_;
+
   DISALLOW_COPY_AND_ASSIGN(TestingPrefServiceSimple);
 };
 
 // Test version of PrefServiceSyncable.
 class TestingPrefServiceSyncable
     : public TestingPrefServiceBase<PrefServiceSyncable> {
  public:
   TestingPrefServiceSyncable();
   virtual ~TestingPrefServiceSyncable();
 
@@ skipping 13 matching lines @@
   }
 
  private:
   TestingBrowserProcess* browser_process_;
   TestingPrefServiceSimple local_state_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedTestingLocalState);
 };
 
 template<>
-TestingPrefServiceBase<PrefServiceSimple>::TestingPrefServiceBase(
+TestingPrefServiceBase<PrefService>::TestingPrefServiceBase(
     TestingPrefStore* managed_prefs,
     TestingPrefStore* user_prefs,
     TestingPrefStore* recommended_prefs,
     DefaultPrefStore* default_store,
     PrefNotifierImpl* pref_notifier);
 
 template<>
 TestingPrefServiceBase<PrefServiceSyncable>::TestingPrefServiceBase(
     TestingPrefStore* managed_prefs,
     TestingPrefStore* user_prefs,
@@ skipping 72 matching lines @@
   pref_store->SetValue(path, value);
 }
 
 template<class SuperPrefService>
 void TestingPrefServiceBase<SuperPrefService>::RemovePref(
     TestingPrefStore* pref_store, const char* path) {
   pref_store->RemoveValue(path);
 }
 
 #endif  // CHROME_TEST_BASE_TESTING_PREF_SERVICE_H_