Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

The first two (PrefServiceSimple is a subclass of PrefService) know
nothing about sync or any Chrome or content concepts.

The third (PrefServiceSyncable, a separate subclass of PrefService)
knows about sync and requires users to choose whether each individual
preference is syncable or not when it is registered.

BrowserProcess::local_state() is a PrefServiceSimple after this
change, and Profile::prefs() is a PrefServiceSyncable.

COLLABORATOR=kaiwang@chromium.org
TBR=ben@chromium.org
BUG=155525


Review URL: https://chromiumcodereview.appspot.com/11570009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174531 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 5 deletions

diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc
index fa64fd4..288a16f 100644
--- a/chrome/browser/extensions/component_loader_unittest.cc
+++ b/chrome/browser/extensions/component_loader_unittest.cc
@@ -75,7 +75,7 @@ class ComponentLoaderTest : public testing::Test {
   ComponentLoaderTest() :
       // Note: we pass the same pref service here, to stand in for both
       // user prefs and local state.
-      component_loader_(&extension_service_, &prefs_, &prefs_) {
+      component_loader_(&extension_service_, &prefs_, &local_state_) {
   }
 
   void SetUp() {
@@ -91,18 +91,23 @@ class ComponentLoaderTest : public testing::Test {
                                &manifest_contents_));
 
     // Register the user prefs that ComponentLoader will read.
-    prefs_.RegisterStringPref(prefs::kEnterpriseWebStoreURL, std::string());
-    prefs_.RegisterStringPref(prefs::kEnterpriseWebStoreName, std::string());
+    prefs_.RegisterStringPref(prefs::kEnterpriseWebStoreURL,
+                              std::string(),
+                              PrefServiceSyncable::UNSYNCABLE_PREF);
+    prefs_.RegisterStringPref(prefs::kEnterpriseWebStoreName,
+                              std::string(),
+                              PrefServiceSyncable::UNSYNCABLE_PREF);
 
     // Register the local state prefs.
 #if defined(OS_CHROMEOS)
-    prefs_.RegisterBooleanPref(prefs::kSpokenFeedbackEnabled, false);
+    local_state_.RegisterBooleanPref(prefs::kSpokenFeedbackEnabled, false);
 #endif
   }
 
  protected:
   MockExtensionService extension_service_;
-  TestingPrefService prefs_;
+  TestingPrefServiceSyncable prefs_;
+  TestingPrefServiceSimple local_state_;
   ComponentLoader component_loader_;
 
   // The root directory of the text extension.