Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

chrome/browser/prefs/pref_model_associator.h

 // 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.
 
 #ifndef CHROME_BROWSER_PREFS_PREF_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_PREFS_PREF_MODEL_ASSOCIATOR_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/threading/non_thread_safe.h"
-#include "chrome/browser/prefs/pref_service.h"
 #include "sync/api/sync_data.h"
 #include "sync/api/syncable_service.h"
 
+class PrefServiceSyncable;
+
 namespace sync_pb {
 class PreferenceSpecifics;
 }
 
 namespace base {
 class Value;
 }
 
 // Contains all preference sync related logic.
 // TODO(sync): Merge this into PrefService once we separate the profile
@@ skipping 36 matching lines @@
   virtual bool IsPrefRegistered(const char* name);
 
   // Unregisters a previously registered preference. This must be called
   // prior to making the first sync.
   virtual void UnregisterPref(const char* name);
 
   // Process a local preference change. This can trigger new SyncChanges being
   // sent to the syncer.
   virtual void ProcessPrefChange(const std::string& name);
 
-  void SetPrefService(PrefService* pref_service);
+  void SetPrefService(PrefServiceSyncable* pref_service);
 
   // Merges the local_value into the supplied server_value and returns
   // the result (caller takes ownership). If there is a conflict, the server
   // value always takes precedence. Note that only certain preferences will
   // actually be merged, all others will return a copy of the server value. See
   // the method's implementation for details.
   static scoped_ptr<base::Value> MergePreference(
       const std::string& name,
       const base::Value& local_value,
       const base::Value& server_value);
@@ skipping 50 matching lines @@
   // The preferences that are currently synced (excludes those preferences
   // that have never had sync data and currently have default values or are
   // policy controlled).
   // Note: this set never decreases, only grows to eventually match
   // registered_preferences_ as more preferences are synced. It determines
   // whether a preference change should update an existing sync node or create
   // a new sync node.
   PreferenceSet synced_preferences_;
 
   // The PrefService we are syncing to.
-  PrefService* pref_service_;
+  PrefServiceSyncable* pref_service_;
 
   // Sync's syncer::SyncChange handler. We push all our changes through this.
   scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
 
   // Sync's error handler. We use this to create sync errors.
   scoped_ptr<syncer::SyncErrorFactory> sync_error_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefModelAssociator);
 };
 
 #endif  // CHROME_BROWSER_PREFS_PREF_MODEL_ASSOCIATOR_H_