Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/extensions/test_extension_prefs.cc

Index: chrome/browser/extensions/test_extension_prefs.cc
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc
index 08f1e31966ee72e4e0a896febff5c80ef5f65a42..54249315c7718633c5fbaf671f48b0434e466c56 100644
--- a/chrome/browser/extensions/test_extension_prefs.cc
+++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -18,8 +18,9 @@
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/extensions/extension_pref_value_map.h"
 #include "chrome/browser/extensions/extension_prefs.h"
-#include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/pref_service_mock_builder.h"
+#include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
@@ -56,21 +57,35 @@ class IncrementalTimeProvider : public ExtensionPrefs::TimeProvider {
 
 }  // namespace
 
-TestExtensionPrefs::TestExtensionPrefs(
-    base::SequencedTaskRunner* task_runner) : pref_service_(NULL),
-                                              task_runner_(task_runner),
-                                              extensions_disabled_(false) {
+TestExtensionPrefs::TestExtensionPrefs(base::SequencedTaskRunner* task_runner)
+    : pref_service_(NULL),
+      task_runner_(task_runner),
+      extensions_disabled_(false) {
   EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
   preferences_file_ = temp_dir_.path().AppendASCII("Preferences");
   extensions_dir_ = temp_dir_.path().AppendASCII("Extensions");
   EXPECT_TRUE(file_util::CreateDirectory(extensions_dir_));
 
+  ResetPrefRegistry();
   RecreateExtensionPrefs();
 }
 
 TestExtensionPrefs::~TestExtensionPrefs() {
 }
 
+PrefService* TestExtensionPrefs::pref_service() {
+  return pref_service_.get();
+}
+
+const scoped_refptr<PrefRegistrySyncable>& TestExtensionPrefs::pref_registry() {
+  return pref_registry_;
+}
+
+void TestExtensionPrefs::ResetPrefRegistry() {
+  pref_registry_ = new PrefRegistrySyncable;
+  ExtensionPrefs::RegisterUserPrefs(pref_registry_);
+}
+
 void TestExtensionPrefs::RecreateExtensionPrefs() {
   // We persist and reload the PrefService's PrefStores because this process
   // deletes all empty dictionaries. The ExtensionPrefs implementation
@@ -93,8 +108,7 @@ void TestExtensionPrefs::RecreateExtensionPrefs() {
   builder.WithUserFilePrefs(preferences_file_, task_runner_);
   builder.WithExtensionPrefs(
       new ExtensionPrefStore(extension_pref_value_map_.get(), false));
-  pref_service_.reset(builder.CreateSyncable());
-  ExtensionPrefs::RegisterUserPrefs(pref_service_.get());
+  pref_service_.reset(builder.CreateSyncable(pref_registry_));
 
   prefs_ = ExtensionPrefs::Create(
       pref_service_.get(),
@@ -156,7 +170,7 @@ std::string TestExtensionPrefs::AddExtensionAndReturnId(std::string name) {
   return extension->id();
 }
 
-PrefServiceSyncable* TestExtensionPrefs::CreateIncognitoPrefService() const {
+PrefService* TestExtensionPrefs::CreateIncognitoPrefService() const {
   return pref_service_->CreateIncognitoPrefService(
       new ExtensionPrefStore(extension_pref_value_map_.get(), true));
 }