Not for check-in. Manually reviewable parts of https://codereview.chromium.org/11570009/

chrome/browser/sync/glue/session_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_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 15 matching lines @@
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sync/glue/data_type_error_handler.h"
 #include "chrome/browser/sync/glue/model_associator.h"
 #include "chrome/browser/sync/glue/synced_session_tracker.h"
 #include "chrome/browser/sync/glue/synced_tab_delegate.h"
 #include "chrome/browser/sync/glue/synced_window_delegate.h"
 #include "chrome/common/cancelable_task_tracker.h"
 #include "googleurl/src/gurl.h"
 #include "sync/internal_api/public/base/model_type.h"
 
-class Prefservice;
+class PrefServiceSyncable;
 class Profile;
 class ProfileSyncService;
 
 namespace content {
 class NavigationEntry;
 }  // namespace content
 
 namespace syncer {
 class BaseTransaction;
 class ReadNode;
@@ skipping 455 matching lines @@
 
   // During integration tests, we sometimes need to block until a local change
   // is made.
   bool waiting_for_change_;
   base::WeakPtrFactory<SessionModelAssociator> test_weak_factory_;
 
   // Profile being synced. Weak pointer.
   Profile* const profile_;
 
   // Pref service. Used to persist the session sync guid. Weak pointer.
-  PrefService* const pref_service_;
+  PrefServiceSyncable* const pref_service_;
 
   DataTypeErrorHandler* error_handler_;
 
   // Used for loading favicons.
   CancelableTaskTracker cancelable_task_tracker_;
 
   // Synced favicon storage and tracking.
   // Map of favicon URL -> favicon info for favicons synced from other clients.
   // TODO(zea): if this becomes expensive memory-wise, reconsider using the
   // favicon service instead. For now, this is simpler due to the history
@@ skipping 18 matching lines @@
   std::map<std::string, linked_ptr<SyncedFaviconInfo> > synced_favicons_;
   // Map of page URL -> favicon url.
   std::map<std::string, std::string> synced_favicon_pages_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_