Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

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"
+#include "chrome/browser/prefs/pref_service_syncable.h"
 
 class PrefModelAssociator;
 class PrefNotifierImpl;
 class PrefRegistrySimple;
+class PrefRegistrySyncable;
 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 68 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestingPrefServiceSimple);
 };
 
 // Test version of PrefServiceSyncable.
 class TestingPrefServiceSyncable
     : public TestingPrefServiceBase<PrefServiceSyncable> {
  public:
   TestingPrefServiceSyncable();
   virtual ~TestingPrefServiceSyncable();
 
+  // This is provided as a convenience; on a production PrefService
+  // you would do all registrations before constructing it, passing it
+  // a PrefRegistry via its constructor (or via
+  // e.g. PrefServiceBuilder).
+  PrefRegistrySyncable* registry();
+
  private:
   DISALLOW_COPY_AND_ASSIGN(TestingPrefServiceSyncable);
 };
 
 // Helper class to temporarily set up a |local_state| in the global
 // TestingBrowserProcess (for most unit tests it's NULL).
 class ScopedTestingLocalState {
  public:
   explicit ScopedTestingLocalState(TestingBrowserProcess* browser_process);
   ~ScopedTestingLocalState();
@@ skipping 96 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_