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/memory/scoped_ptr.h"
 #include "base/prefs/testing_pref_store.h"
+#include "chrome/browser/prefs/pref_registry.h"
 #include "chrome/browser/prefs/pref_service.h"
 
-class DefaultPrefStore;
 class PrefModelAssociator;
 class PrefNotifierImpl;
+class PrefRegistrySimple;
 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
 // (managed, extension, user) conveniently.
 //
 // Use this via its specializations, TestingPrefServiceSimple and
 // TestingPrefServiceSyncable.
 template <class SuperPrefService>
@@ skipping 21 matching lines @@
   // Similar to the above, but for recommended policy preferences.
   const Value* GetRecommendedPref(const char* path) const;
   void SetRecommendedPref(const char* path, Value* value);
   void RemoveRecommendedPref(const char* path);
 
  protected:
   TestingPrefServiceBase(
       TestingPrefStore* managed_prefs,
       TestingPrefStore* user_prefs,
       TestingPrefStore* recommended_prefs,
-      DefaultPrefStore* default_store,
+      PrefRegistry* pref_registry,
       PrefNotifierImpl* pref_notifier);
 
  private:
   // Reads the value of the preference indicated by |path| from |pref_store|.
   // Returns NULL if the preference was not found.
   const Value* GetPref(TestingPrefStore* pref_store, const char* path) const;
 
   // Sets the value for |path| in |pref_store|.
   void SetPref(TestingPrefStore* pref_store, const char* path, Value* value);
 
   // Removes the preference identified by |path| from |pref_store|.
   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();
 
+  // This is provided as a convenience; on a production PrefService

[Mattias Nissler (ping if slow), 2013/01/31 14:50:45]

maybe elaborate: "as a convenience for registering preferences on an existing
TestingPrefServiceSimple instance"

[Jói, 2013/01/31 16:23:37]

Done.

+  // you would do all registrations before constructing it, passing it
+  // a PrefRegistry via its constructor (or via
+  // e.g. PrefServiceBuilder).
+  PrefRegistrySimple* registry();
+
  private:
   DISALLOW_COPY_AND_ASSIGN(TestingPrefServiceSimple);
 };
 
 // Test version of PrefServiceSyncable.
 class TestingPrefServiceSyncable
     : public TestingPrefServiceBase<PrefServiceSyncable> {
  public:
   TestingPrefServiceSyncable();
   virtual ~TestingPrefServiceSyncable();
@@ skipping 14 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,
+    PrefRegistry* pref_registry,
     PrefNotifierImpl* pref_notifier);
 
 template<>
 TestingPrefServiceBase<PrefServiceSyncable>::TestingPrefServiceBase(
     TestingPrefStore* managed_prefs,
     TestingPrefStore* user_prefs,
     TestingPrefStore* recommended_prefs,
-    DefaultPrefStore* default_store,
+    PrefRegistry* pref_registry,
     PrefNotifierImpl* pref_notifier);
 
 template<class SuperPrefService>
 TestingPrefServiceBase<SuperPrefService>::~TestingPrefServiceBase() {
 }
 
 template<class SuperPrefService>
 const Value* TestingPrefServiceBase<SuperPrefService>::GetManagedPref(
     const char* path) const {
   return GetPref(managed_prefs_, path);
@@ skipping 60 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_