Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/extensions/extension_prefs_unittest.cc

 // 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.
 
 #include "extension_prefs_unittest.h"
 
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_pref_value_map.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/prefs/mock_pref_change_callback.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
+#include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "chrome/common/extensions/permissions/permissions_info.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/mock_notification_observer.h"
 #include "sync/api/string_ordinal.h"
 
@@ skipping 24 matching lines @@
 }
 
 ExtensionPrefsTest::ExtensionPrefsTest()
     : ui_thread_(BrowserThread::UI, &message_loop_),
       prefs_(message_loop_.message_loop_proxy()) {
 }
 
 ExtensionPrefsTest::~ExtensionPrefsTest() {
 }
 
-void ExtensionPrefsTest::RegisterPreferences() {}
+void ExtensionPrefsTest::RegisterPreferences(PrefRegistrySyncable* registry) {}
 
 void ExtensionPrefsTest::SetUp() {
-  RegisterPreferences();
+  RegisterPreferences(prefs_.pref_registry());
   Initialize();
 }
 
 void ExtensionPrefsTest::TearDown() {
   Verify();
 
   // Reset ExtensionPrefs, and re-verify.
+  prefs_.ResetPrefRegistry();
+  RegisterPreferences(prefs_.pref_registry());
   prefs_.RecreateExtensionPrefs();
-  RegisterPreferences();
   Verify();
   prefs_.pref_service()->CommitPendingWrite();
   message_loop_.RunUntilIdle();
 }
 
 // Tests the LastPingDay/SetLastPingDay functions.
 class ExtensionPrefsLastPingDay : public ExtensionPrefsTest {
  public:
   ExtensionPrefsLastPingDay()
       : extension_time_(Time::Now() - TimeDelta::FromHours(4)),
@@ skipping 728 matching lines @@
   ext2_ = ext2_scoped_.get();
   ext3_ = ext3_scoped_.get();
   ext4_ = ext4_scoped_.get();
 
   for (size_t i = 0; i < arraysize(installed); ++i)
     installed[i] = false;
 }
 
 ExtensionPrefsPrepopulatedTest::~ExtensionPrefsPrepopulatedTest() {}
 
-void ExtensionPrefsPrepopulatedTest::RegisterPreferences() {
-  prefs()->pref_service()->RegisterStringPref(
-      kPref1, kDefaultPref1, PrefServiceSyncable::UNSYNCABLE_PREF);
-  prefs()->pref_service()->RegisterStringPref(
-      kPref2, kDefaultPref2, PrefServiceSyncable::UNSYNCABLE_PREF);
-  prefs()->pref_service()->RegisterStringPref(
-      kPref3, kDefaultPref3, PrefServiceSyncable::UNSYNCABLE_PREF);
-  prefs()->pref_service()->RegisterStringPref(
-      kPref4, kDefaultPref4, PrefServiceSyncable::UNSYNCABLE_PREF);
+void ExtensionPrefsPrepopulatedTest::RegisterPreferences(
+    PrefRegistrySyncable* registry) {
+  registry->RegisterStringPref(
+      kPref1, kDefaultPref1, PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(
+      kPref2, kDefaultPref2, PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(
+      kPref3, kDefaultPref3, PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(
+      kPref4, kDefaultPref4, PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 void ExtensionPrefsPrepopulatedTest::InstallExtControlledPref(
     Extension *ext,
     const std::string& key,
     Value* val) {
   EnsureExtensionInstalled(ext);
   prefs()->SetExtensionControlledPref(
       ext->id(), key, kExtensionPrefsScopeRegular, val);
 }
@@ skipping 403 matching lines @@
 
  private:
   scoped_refptr<const Extension> extension_a_;
   scoped_refptr<const Extension> extension_b_;
   scoped_refptr<const Extension> extension_c_;
 };
 TEST_F(ExtensionPrefsBlacklistedExtensions,
        ExtensionPrefsBlacklistedExtensions) {}
 
 }  // namespace extensions