Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/extensions/test_extension_prefs.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_BROWSER_EXTENSIONS_TEST_EXTENSION_PREFS_H_
 #define CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_PREFS_H_
 
 #include <string>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/extensions/manifest.h"
 
 class ExtensionPrefValueMap;
+class PrefRegistrySyncable;
+class PrefService;
 class PrefServiceSyncable;
 
 namespace base {
 class DictionaryValue;
 class SequencedTaskRunner;
 }
 
 namespace extensions {
 class Extension;
 class ExtensionPrefs;
 
 // This is a test class intended to make it easier to work with ExtensionPrefs
 // in tests.
 class TestExtensionPrefs {
  public:
   explicit TestExtensionPrefs(base::SequencedTaskRunner* task_runner);
   virtual ~TestExtensionPrefs();
 
   ExtensionPrefs* prefs() { return prefs_.get(); }
   const ExtensionPrefs& const_prefs() const {
       return *prefs_.get();
   }
-  PrefServiceSyncable* pref_service() { return pref_service_.get(); }
+  PrefService* pref_service();
+  const scoped_refptr<PrefRegistrySyncable>& pref_registry();
+  void ResetPrefRegistry();
   const base::FilePath& temp_dir() const { return temp_dir_.path(); }
   const base::FilePath& extensions_dir() const { return extensions_dir_; }
 
   // This will cause the ExtensionPrefs to be deleted and recreated, based on
   // any existing backing file we had previously created.
   void RecreateExtensionPrefs();
 
   // Creates a new Extension with the given name in our temp dir, adds it to
   // our ExtensionPrefs, and returns it.
   scoped_refptr<Extension> AddExtension(std::string name);
@@ skipping 11 matching lines @@
   scoped_refptr<Extension> AddExtensionWithManifestAndFlags(
       const base::DictionaryValue& manifest,
       Manifest::Location location,
       int extra_flags);
 
   // Similar to AddExtension, this adds a new test Extension. This is useful for
   // cases when you don't need the Extension object, but just the id it was
   // assigned.
   std::string AddExtensionAndReturnId(std::string name);
 
-  PrefServiceSyncable* CreateIncognitoPrefService() const;
+  PrefService* CreateIncognitoPrefService() const;
 
   // Allows disabling the loading of preferences of extensions. Becomes
   // active after calling RecreateExtensionPrefs(). Defaults to false.
   void set_extensions_disabled(bool extensions_disabled);
 
  protected:
   base::ScopedTempDir temp_dir_;
   base::FilePath preferences_file_;
   base::FilePath extensions_dir_;
+  scoped_refptr<PrefRegistrySyncable> pref_registry_;
   scoped_ptr<PrefServiceSyncable> pref_service_;
   scoped_ptr<ExtensionPrefs> prefs_;
   scoped_ptr<ExtensionPrefValueMap> extension_pref_value_map_;
   const scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
  private:
   bool extensions_disabled_;
   DISALLOW_COPY_AND_ASSIGN(TestExtensionPrefs);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_PREFS_H_