Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

chrome/browser/custom_handlers/protocol_handler_registry_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 "chrome/browser/custom_handlers/protocol_handler_registry.h"
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 261 matching lines @@
  protected:
   ProtocolHandlerRegistryTest()
   : ui_thread_(BrowserThread::UI, &loop_),
     file_thread_(BrowserThread::FILE, &loop_),
     io_thread_(BrowserThread::IO, &loop_),
     test_protocol_handler_(CreateProtocolHandler("test", "test")) {}
 
   FakeDelegate* delegate() const { return delegate_; }
   ProtocolHandlerRegistry* registry() { return registry_.get(); }
   TestingProfile* profile() const { return profile_.get(); }
-  PrefService* pref_service() const { return profile_->GetPrefs(); }
+  PrefServiceSyncable* pref_service() const { return profile_->GetPrefs(); }

[Mattias Nissler (ping if slow), 2012/12/19 19:50:22]

Is this accessor really necessary? It seems the code in SetUp() could do
without.

[Jói, 2012/12/20 16:30:31]

Added a TODO to investigate this.

   const ProtocolHandler& test_protocol_handler() const {
     return test_protocol_handler_;
   }
 
   ProtocolHandler CreateProtocolHandler(const std::string& protocol,
                                         const GURL& url,
                                         const std::string& title) {
     return ProtocolHandler::CreateProtocolHandler(protocol, url,
         UTF8ToUTF16(title));
   }
@@ skipping 18 matching lines @@
   }
 
   void TeadDownRegistry() {
     registry_->Shutdown();
     registry_.reset();
     // Registry owns the delegate_ it handles deletion of that object.
   }
 
   virtual void SetUp() {
     profile_.reset(new TestingProfile());
-    profile_->SetPrefService(new TestingPrefService());
+    profile_->SetPrefService(new TestingPrefServiceSyncable());

[Mattias Nissler (ping if slow), 2012/12/19 19:50:22]

This shouldn't be necessary, TestingProfile already has a PrefService.

[Jói, 2012/12/20 16:30:31]

As above, added TODO to investigate.

     SetUpRegistry(true);
     test_protocol_handler_ =
         CreateProtocolHandler("test", GURL("http://test.com/%s"), "Test");
-    ProtocolHandlerRegistry::RegisterPrefs(pref_service());
+    ProtocolHandlerRegistry::RegisterUserPrefs(pref_service());

[Mattias Nissler (ping if slow), 2012/12/19 19:50:22]

This should be removed if you remove line 321.

[Jói, 2012/12/20 16:30:31]

Ditto.

   }
 
   virtual void TearDown() {
     TeadDownRegistry();
   }
 
   TestMessageLoop loop_;
 
  private:
   content::TestBrowserThread ui_thread_;
@@ skipping 550 matching lines @@
 
 TEST_F(ProtocolHandlerRegistryTest, MAYBE_TestInstallDefaultHandler) {
   RecreateRegistry(false);
   registry()->AddPredefinedHandler(CreateProtocolHandler(
       "test", GURL("http://test.com/%s"), "Test"));
   registry()->InitProtocolSettings();
   std::vector<std::string> protocols;
   registry()->GetRegisteredProtocols(&protocols);
   ASSERT_EQ(static_cast<size_t>(1), protocols.size());
 }