Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/extensions/component_loader_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 <string>
 
 #include "chrome/browser/extensions/component_loader.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/extensions/test_extension_service.h"
 #include "chrome/browser/prefs/pref_registry_simple.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using extensions::Extension;
 
 namespace {
@@ skipping 62 matching lines @@
                      .AppendASCII("Extensions")
                      .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
                      .AppendASCII("1.0.0.0");
 
     // Read in the extension manifest.
     ASSERT_TRUE(file_util::ReadFileToString(
         extension_path_.Append(Extension::kManifestFilename),
                                &manifest_contents_));
 
     // Register the user prefs that ComponentLoader will read.
-    prefs_.RegisterStringPref(prefs::kEnterpriseWebStoreURL,
-                              std::string(),
-                              PrefServiceSyncable::UNSYNCABLE_PREF);
-    prefs_.RegisterStringPref(prefs::kEnterpriseWebStoreName,
-                              std::string(),
-                              PrefServiceSyncable::UNSYNCABLE_PREF);
+    prefs_.registry()->RegisterStringPref(
+        prefs::kEnterpriseWebStoreURL,
+        std::string(),
+        PrefRegistrySyncable::UNSYNCABLE_PREF);
+    prefs_.registry()->RegisterStringPref(
+        prefs::kEnterpriseWebStoreName,
+        std::string(),
+        PrefRegistrySyncable::UNSYNCABLE_PREF);
 
     // Register the local state prefs.
 #if defined(OS_CHROMEOS)
     local_state_.registry()->RegisterBooleanPref(
         prefs::kSpokenFeedbackEnabled, false);
 #endif
   }
 
  protected:
   MockExtensionService extension_service_;
@@ skipping 195 matching lines @@
   EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
   EXPECT_EQ(0u, extension_service_.unloaded_count());
 
   // replace loaded component extension.
   component_loader_.AddOrReplace(known_extension);
   EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
   EXPECT_EQ(1u, extension_service_.unloaded_count());
 }
 
 }  // namespace extensions