Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

chrome/test/base/testing_pref_service.cc

Index: chrome/test/base/testing_pref_service.cc
diff --git a/chrome/test/base/testing_pref_service.cc b/chrome/test/base/testing_pref_service.cc
index ec5b44acb772fd08b95b17b4b128adea0263cc6e..af8c0a440ca9dc2813e8c2b483b7c0f39800ca2a 100644
--- a/chrome/test/base/testing_pref_service.cc
+++ b/chrome/test/base/testing_pref_service.cc
@@ -30,7 +30,6 @@ TestingPrefServiceBase::TestingPrefServiceBase(
     TestingPrefStore* user_prefs,
     TestingPrefStore* recommended_prefs,
     DefaultPrefStore* default_store,
-    PrefModelAssociator* pref_sync_associator,
     PrefNotifierImpl* pref_notifier)
     : PrefService(pref_notifier,
                   new PrefValueStore(
@@ -44,7 +43,6 @@ TestingPrefServiceBase::TestingPrefServiceBase(
                       pref_notifier),
                   user_prefs,
                   default_store,
-                  pref_sync_associator,
                   base::Bind(&l10n_util::GetStringUTF8),
                   base::Bind(&HandleReadError),
                   false),
@@ -116,7 +114,6 @@ TestingPrefService::TestingPrefService()
                              new TestingPrefStore(),
                              new TestingPrefStore(),
                              new DefaultPrefStore(),
-                             new PrefModelAssociator(),
                              new PrefNotifierImpl()) {
 }