Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

chrome/browser/net/ssl_config_service_manager_pref_unittest.cc

Index: chrome/browser/net/ssl_config_service_manager_pref_unittest.cc
diff --git a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc
index ef9b0be1f0a8a2c33182f032e39fb56b3bea72b0..4149637f3650eb2823e948c983035181d4062992 100644
--- a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc
+++ b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc
@@ -60,7 +60,7 @@ class SSLConfigServiceManagerPrefTest : public testing::Test {
 
 // Test channel id with no user prefs.
 TEST_F(SSLConfigServiceManagerPrefTest, ChannelIDWithoutUserPrefs) {
-  TestingPrefService local_state;
+  TestingPrefServiceSimple local_state;
   SSLConfigServiceManager::RegisterPrefs(&local_state);
   local_state.SetUserPref(prefs::kEnableOriginBoundCerts,
                           Value::CreateBooleanValue(false));
@@ -86,13 +86,14 @@ TEST_F(SSLConfigServiceManagerPrefTest, ChannelIDWithoutUserPrefs) {
 
 // Test channel id with user prefs.
 TEST_F(SSLConfigServiceManagerPrefTest, ChannelIDWithUserPrefs) {
-  TestingPrefService local_state;
+  TestingPrefServiceSimple local_state;
   SSLConfigServiceManager::RegisterPrefs(&local_state);
   local_state.SetUserPref(prefs::kEnableOriginBoundCerts,
                           Value::CreateBooleanValue(false));
 
   TestingProfile testing_profile;
-  TestingPrefService* user_prefs = testing_profile.GetTestingPrefService();
+  TestingPrefServiceSyncable* user_prefs =
+      testing_profile.GetTestingPrefService();
   SetCookiePref(&testing_profile, CONTENT_SETTING_BLOCK);
   user_prefs->SetUserPref(prefs::kBlockThirdPartyCookies,
                           Value::CreateBooleanValue(true));
@@ -150,7 +151,7 @@ TEST_F(SSLConfigServiceManagerPrefTest, ChannelIDWithUserPrefs) {
 // Test that cipher suites can be disabled. "Good" refers to the fact that
 // every value is expected to be successfully parsed into a cipher suite.
 TEST_F(SSLConfigServiceManagerPrefTest, GoodDisabledCipherSuites) {
-  TestingPrefService local_state;
+  TestingPrefServiceSimple local_state;
   SSLConfigServiceManager::RegisterPrefs(&local_state);
 
   scoped_ptr<SSLConfigServiceManager> config_manager(
@@ -185,7 +186,7 @@ TEST_F(SSLConfigServiceManagerPrefTest, GoodDisabledCipherSuites) {
 // there are one or more non-cipher suite strings in the preference. They
 // should be ignored.
 TEST_F(SSLConfigServiceManagerPrefTest, BadDisabledCipherSuites) {
-  TestingPrefService local_state;
+  TestingPrefServiceSimple local_state;
   SSLConfigServiceManager::RegisterPrefs(&local_state);
 
   scoped_ptr<SSLConfigServiceManager> config_manager(
@@ -225,7 +226,7 @@ TEST_F(SSLConfigServiceManagerPrefTest, NoCommandLinePrefs) {
 
   PrefServiceMockBuilder builder;
   builder.WithUserPrefs(local_state_store.get());
-  scoped_ptr<PrefService> local_state(builder.Create());
+  scoped_ptr<PrefServiceSimple> local_state(builder.CreateSimple());
 
   SSLConfigServiceManager::RegisterPrefs(local_state.get());
 
@@ -268,7 +269,7 @@ TEST_F(SSLConfigServiceManagerPrefTest, CommandLinePrefs) {
   PrefServiceMockBuilder builder;
   builder.WithUserPrefs(local_state_store.get());
   builder.WithCommandLine(&command_line);
-  scoped_ptr<PrefService> local_state(builder.Create());
+  scoped_ptr<PrefServiceSimple> local_state(builder.CreateSimple());
 
   SSLConfigServiceManager::RegisterPrefs(local_state.get());