Refactor syncable DEVICE_INFO type from ChangeProcessor to SyncableService - part 3.

chrome/browser/sync/glue/sync_backend_host_core.h

Index: chrome/browser/sync/glue/sync_backend_host_core.h
diff --git a/chrome/browser/sync/glue/sync_backend_host_core.h b/chrome/browser/sync/glue/sync_backend_host_core.h
index 5e61339a5d41ed79d10d80850845dac4d46dc2a3..8e36fe8fb948afbfd909c4c5820bdcec5c3263d6 100644
--- a/chrome/browser/sync/glue/sync_backend_host_core.h
+++ b/chrome/browser/sync/glue/sync_backend_host_core.h
@@ -180,15 +180,9 @@ class SyncBackendHostCore
   void OnControlTypesDownloadRetry();
 
   // Called to perform tasks which require the control data to be downloaded.
-  // This includes refreshing encryption, setting up the device info change
-  // processor, etc.
+  // This includes refreshing encryption, etc.
   void DoInitialProcessControlTypes();
 
-  // Some parts of DoInitialProcessControlTypes() may be executed on a different
-  // thread.  This function asynchronously continues the work started in
-  // DoInitialProcessControlTypes() once that other thread gets back to us.
-  void DoFinishInitialProcessControlTypes();
-
   // The shutdown order is a bit complicated:
   // 1) Call ShutdownOnUIThread() from |frontend_loop_| to request sync manager
   //    to stop as soon as possible.
@@ -219,10 +213,6 @@ class SyncBackendHostCore
 
   syncer::SyncManager* sync_manager() { return sync_manager_.get(); }
 
-  SyncedDeviceTracker* synced_device_tracker() {
-    return synced_device_tracker_.get();
-  }
-
   void SendBufferedProtocolEventsAndEnableForwarding();
   void DisableProtocolEventForwarding();
 
@@ -293,9 +283,6 @@ class SyncBackendHostCore
   // Our encryptor, which uses Chrome's encryption functions.
   sync_driver::SystemEncryptor encryptor_;
 
-  // A special ChangeProcessor that tracks the DEVICE_INFO type for us.
-  scoped_ptr<SyncedDeviceTracker> synced_device_tracker_;
-
   // The top-level syncapi entry point.  Lives on the sync thread.
   scoped_ptr<syncer::SyncManager> sync_manager_;
 
@@ -323,6 +310,7 @@ class SyncBackendHostCore
   // Set when the forwarding of per-type debug counters is enabled.
   bool forward_type_info_;
 
+  // TODO: do we still need this?

[pavely, 2014/09/17 23:04:38]

No, we don't.

[stanisc, 2014/09/18 22:46:54]

Done.

   // Obtained from SigninClient::GetSigninScopedDeviceId(). Stored here just to
   // pass from SyncBackendHostImpl to SyncedDeviceTracker.
   std::string signin_scoped_device_id_;