Split testing_pref_service.h/.cc into two parts, generic vs. Chrome-specific.

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/pref_registry.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/testing_pref_store.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.
+// Use this via its specializations, e.g. TestingPrefServiceSimple.
 template <class SuperPrefService>
 class TestingPrefServiceBase : public SuperPrefService {
  public:
   virtual ~TestingPrefServiceBase();
 
   // Read the value of a preference from the managed layer. Returns NULL if the
   // preference is not defined at the managed layer.
   const Value* GetManagedPref(const char* path) const;
 
   // Set a preference on the managed layer and fire observers if the preference
   // changed. Assumes ownership of |value|.
   void SetManagedPref(const char* path, Value* value);
 
   // Clear the preference on the managed layer and fire observers if the
   // preference has been defined previously.
   void RemoveManagedPref(const char* path);
 
   // Similar to the above, but for user preferences.
   const Value* GetUserPref(const char* path) const;
   void SetUserPref(const char* path, Value* value);
   void RemoveUserPref(const char* path);
 
   // 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);
 
+  // Do-nothing implementation for TestingPrefService.
+  static void HandleReadError(PersistentPrefStore::PrefReadError error) {}
+
  protected:
   TestingPrefServiceBase(
       TestingPrefStore* managed_prefs,
       TestingPrefStore* user_prefs,
       TestingPrefStore* recommended_prefs,
       PrefRegistry* pref_registry,
       PrefNotifierImpl* pref_notifier);
 
  private:
   // Reads the value of the preference indicated by |path| from |pref_store|.
@@ skipping 25 matching lines @@
   // an existing TestingPrefServiceSimple instance. On a production
   // PrefService 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();
-
-  // 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();
-
-  TestingPrefServiceSimple* Get() {
-    return &local_state_;
-  }
-
- private:
-  TestingBrowserProcess* browser_process_;
-  TestingPrefServiceSimple local_state_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedTestingLocalState);
-};
-
 template<>
 TestingPrefServiceBase<PrefService>::TestingPrefServiceBase(
     TestingPrefStore* managed_prefs,
     TestingPrefStore* user_prefs,
     TestingPrefStore* recommended_prefs,
     PrefRegistry* pref_registry,
     PrefNotifierImpl* pref_notifier);
 
-template<>
-TestingPrefServiceBase<PrefServiceSyncable>::TestingPrefServiceBase(
-    TestingPrefStore* managed_prefs,
-    TestingPrefStore* user_prefs,
-    TestingPrefStore* recommended_prefs,
-    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 58 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_