[sync] Upstream the Android ProfileSyncService

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 396 matching lines @@
   bool setup_for_test_;
 
   // 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.
-  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
   // backend not properly supporting expiration of synced favicons.
@@ skipping 17 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_