NOT FOR COMMIT: Add DeviceInfo type and ChangeProcessor

sync/internal_api/sync_manager_impl.h

Index: sync/internal_api/sync_manager_impl.h
diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h
index a721fa2fbd015d77a47a8795a337eb0cf21b834b..80d0cbfeca51395cd190bb3b40cea33d98ee811a 100644
--- a/sync/internal_api/sync_manager_impl.h
+++ b/sync/internal_api/sync_manager_impl.h
@@ -66,7 +66,6 @@ class SyncManagerImpl : public SyncManager,
       const std::string& sync_server_and_path,
       int sync_server_port,
       bool use_ssl,
-      const scoped_refptr<base::TaskRunner>& blocking_task_runner,
       scoped_ptr<HttpPostProviderFactory> post_factory,
       const std::vector<ModelSafeWorker*>& workers,
       ExtensionsActivityMonitor* extensions_activity_monitor,
@@ -109,6 +108,7 @@ class SyncManagerImpl : public SyncManager,
   virtual void StopSyncingForShutdown(const base::Closure& callback) OVERRIDE;
   virtual void ShutdownOnSyncThread() OVERRIDE;
   virtual UserShare* GetUserShare() OVERRIDE;
+

[Nicolas Zea, 2012/09/13 00:45:55]

remove newline

[rlarocque, 2012/09/14 01:03:07]

Done.

   virtual bool ReceivedExperiment(Experiments* experiments) OVERRIDE;
   virtual bool HasUnsyncedItems() OVERRIDE;
   virtual SyncEncryptionHandler* GetEncryptionHandler() OVERRIDE;
@@ -246,16 +246,9 @@ class SyncManagerImpl : public SyncManager,
                                 bool existed_before,
                                 bool exists_now);
 
-  // Internal callback used by GetSessionName.
-  // TODO(rlarocque): not currently called from anywhere. This should be
-  // hooked up to something once we start preserving device information again.
-  void UpdateSessionNameCallback(const std::string& chrome_version,
-                                 const std::string& session_name);
-
   // Called for every notification. This updates the notification statistics
   // to be displayed in about:sync.
-  void UpdateNotificationInfo(
-      const ModelTypeStateMap& type_state_map);
+  void UpdateNotificationInfo(const ModelTypeStateMap& type_state_map);
 
   // Checks for server reachabilty and requests a nudge.
   void OnIPAddressChangedImpl();
@@ -305,10 +298,6 @@ class SyncManagerImpl : public SyncManager,
   // WeakHandle when we construct it.
   WeakHandle<SyncManagerImpl> weak_handle_this_;
 
-  // |blocking_task_runner| is a TaskRunner to be used for tasks that
-  // may block on disk I/O.
-  scoped_refptr<base::TaskRunner> blocking_task_runner_;
-
   // We give a handle to share_ to clients of the API for use when constructing
   // any transaction type.
   UserShare share_;