Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

chrome/browser/content_settings/content_settings_pref_provider_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/content_settings/content_settings_pref_provider.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 115 matching lines @@
 }
 
 // Test for regression in which the PrefProvider modified the user pref store
 // of the OTR unintentionally: http://crbug.com/74466.
 TEST_F(PrefProviderTest, Incognito) {
   PersistentPrefStore* user_prefs = new TestingPrefStore();
   OverlayUserPrefStore* otr_user_prefs =
       new OverlayUserPrefStore(user_prefs);
 
   PrefServiceMockBuilder builder;
-  PrefService* regular_prefs = builder.WithUserPrefs(user_prefs).Create();
+  builder.WithUserPrefs(user_prefs);
+  PrefServiceSyncable* regular_prefs = builder.CreateSyncable();
 
   Profile::RegisterUserPrefs(regular_prefs);
   chrome::RegisterUserPrefs(regular_prefs);
 
-  PrefService* otr_prefs = builder.WithUserPrefs(otr_user_prefs).Create();
+  builder.WithUserPrefs(otr_user_prefs);
+  PrefServiceSyncable* otr_prefs = builder.CreateSyncable();
 
   Profile::RegisterUserPrefs(otr_prefs);
   chrome::RegisterUserPrefs(otr_prefs);
 
   TestingProfile profile;
   TestingProfile* otr_profile = new TestingProfile;
   profile.SetOffTheRecordProfile(otr_profile);
   profile.SetPrefService(regular_prefs);
   otr_profile->set_incognito(true);
   otr_profile->SetPrefService(otr_prefs);
@@ skipping 172 matching lines @@
             GetContentSetting(
                 &pref_content_settings_provider,
                 host, host, CONTENT_SETTINGS_TYPE_PLUGINS,
                 resource2, false));
 
   pref_content_settings_provider.ShutdownOnUIThread();
 }
 
 TEST_F(PrefProviderTest, AutoSubmitCertificateContentSetting) {
   TestingProfile profile;
-  TestingPrefService* prefs = profile.GetTestingPrefService();
+  TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();
   GURL primary_url("https://www.example.com");
   GURL secondary_url("https://www.sample.com");
 
   PrefProvider provider(prefs, false);
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             GetContentSetting(
                 &provider,
                 primary_url,
                 primary_url,
@@ skipping 13 matching lines @@
                 primary_url,
                 secondary_url,
                 CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
                 std::string(),
                 false));
   provider.ShutdownOnUIThread();
 }
 
 // http://crosbug.com/17760
 TEST_F(PrefProviderTest, Deadlock) {
-  TestingPrefService prefs;
+  TestingPrefServiceSyncable prefs;
   PrefProvider::RegisterUserPrefs(&prefs);
 
   // Chain of events: a preference changes, |PrefProvider| notices it, and reads
   // and writes the preference. When the preference is written, a notification
   // is sent, and this used to happen when |PrefProvider| was still holding its
   // lock.
 
   PrefProvider provider(&prefs, false);
   DeadlockCheckerObserver observer(&prefs, &provider);
   {
     DictionaryPrefUpdate update(&prefs,
                                 prefs::kContentSettingsPatternPairs);
     DictionaryValue* mutable_settings = update.Get();
     mutable_settings->SetWithoutPathExpansion("www.example.com,*",
                                               new base::DictionaryValue());
   }
   EXPECT_TRUE(observer.notification_received());
 
   provider.ShutdownOnUIThread();
 }
 
 }  // namespace content_settings