Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

chrome/test/base/testing_pref_service.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/test/base/testing_pref_service.h"
 
 #include "base/bind.h"
 #include "base/prefs/default_pref_store.h"
 #include "base/prefs/testing_pref_store.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
@@ skipping 12 matching lines @@
 void HandleReadError(PersistentPrefStore::PrefReadError error) {
 }
 
 }  // namespace
 
 TestingPrefServiceBase::TestingPrefServiceBase(
     TestingPrefStore* managed_prefs,
     TestingPrefStore* user_prefs,
     TestingPrefStore* recommended_prefs,
     DefaultPrefStore* default_store,
-    PrefModelAssociator* pref_sync_associator,
     PrefNotifierImpl* pref_notifier)
     : PrefService(pref_notifier,
                   new PrefValueStore(
                       managed_prefs,
                       NULL,
                       NULL,
                       user_prefs,
                       recommended_prefs,
                       default_store,
                       pref_sync_associator,
                       pref_notifier),
                   user_prefs,
                   default_store,
-                  pref_sync_associator,
                   base::Bind(&l10n_util::GetStringUTF8),
                   base::Bind(&HandleReadError),
                   false),
       managed_prefs_(managed_prefs),
       user_prefs_(user_prefs),
       recommended_prefs_(recommended_prefs) {
 }
 
 TestingPrefServiceBase::~TestingPrefServiceBase() {
 }
@@ skipping 51 matching lines @@
 void TestingPrefServiceBase::RemovePref(TestingPrefStore* pref_store,
                                         const char* path) {
   pref_store->RemoveValue(path);
 }
 
 TestingPrefService::TestingPrefService()
     : TestingPrefServiceBase(new TestingPrefStore(),
                              new TestingPrefStore(),
                              new TestingPrefStore(),
                              new DefaultPrefStore(),
-                             new PrefModelAssociator(),
                              new PrefNotifierImpl()) {
 }
 
 TestingPrefService::~TestingPrefService() {
 }
 
 ScopedTestingLocalState::ScopedTestingLocalState(
     TestingBrowserProcess* browser_process)
     : browser_process_(browser_process) {
   chrome::RegisterLocalState(&local_state_);
   EXPECT_FALSE(browser_process->local_state());
   browser_process->SetLocalState(&local_state_);
 }
 
 ScopedTestingLocalState::~ScopedTestingLocalState() {
   EXPECT_EQ(&local_state_, browser_process_->local_state());
   browser_process_->SetLocalState(NULL);
 }