Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc

Index: chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
index 0c89013fe787819ac11d616d9e475dc8e8453c1b..1561a1494294d6ac148ddd46cff563444ecf5603 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
@@ -279,7 +279,9 @@ class ProtocolHandlerRegistryTest : public testing::Test {
   FakeDelegate* delegate() const { return delegate_; }
   ProtocolHandlerRegistry* registry() { return registry_.get(); }
   TestingProfile* profile() const { return profile_.get(); }
-  PrefService* pref_service() const { return profile_->GetPrefs(); }
+  // TODO(joi): Check if this can be removed, as well as the call to
+  // SetPrefService in SetUp.
+  PrefServiceSyncable* pref_service() const { return profile_->GetPrefs(); }
   const ProtocolHandler& test_protocol_handler() const {
     return test_protocol_handler_;
   }
@@ -318,11 +320,14 @@ class ProtocolHandlerRegistryTest : public testing::Test {
 
   virtual void SetUp() {
     profile_.reset(new TestingProfile());
-    profile_->SetPrefService(new TestingPrefService());
+    profile_->SetPrefService(new TestingPrefServiceSyncable());
     SetUpRegistry(true);
     test_protocol_handler_ =
         CreateProtocolHandler("test", GURL("http://test.com/%s"), "Test");
-    ProtocolHandlerRegistry::RegisterPrefs(pref_service());
+
+    // TODO(joi): If pref_service() and the SetPrefService above go,
+    // then this could go.
+    ProtocolHandlerRegistry::RegisterUserPrefs(pref_service());
   }
 
   virtual void TearDown() {