NOT FOR COMMIT: Add DeviceInfo type and ChangeProcessor

chrome/browser/sync/glue/sync_backend_host.h

Index: chrome/browser/sync/glue/sync_backend_host.h
diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h
index 1d663815b77b4d5273ff2a6cd5812791012c5143..01cb15fe54f39e2cfb67a3ca8f8ed6fa3229bedf 100644
--- a/chrome/browser/sync/glue/sync_backend_host.h
+++ b/chrome/browser/sync/glue/sync_backend_host.h
@@ -370,11 +370,12 @@ class SyncBackendHost : public BackendDataTypeConfigurer {
                             // has been created.
     NOT_INITIALIZED,        // Initialization hasn't completed, but we've
                             // constructed a SyncManager.
-    DOWNLOADING_NIGORI,     // The SyncManager is initialized, but
-                            // we're fetching sync encryption information.
-    ASSOCIATING_NIGORI,     // The SyncManager is initialized, and we
-                            // have the sync encryption information, but we
-                            // have to update the local encryption state.
+    DOWNLOADING_METADATA,   // The SyncManager is initialized, but
+                            // we're fetching metadata, such as encryption
+                            // information, from the server.
+    PROCESSING_METADATA,    // Running init tasks that require metadata to be
+                            // available.  This includes registering our device
+                            // information and refreshing encryption.
     INITIALIZED,            // Initialization is complete.
   };
 
@@ -477,6 +478,10 @@ class SyncBackendHost : public BackendDataTypeConfigurer {
   // initialization is done yet.
   void StopSyncManagerForShutdown(const base::Closure& closure);
 
+  // Must be called on |frontend_loop_|.  |done_callback| is called on
+  // |frontend_loop_|.
+  void InitialProcessMetadata(const base::Closure& done_callback);
+
   base::WeakPtrFactory<SyncBackendHost> weak_ptr_factory_;
 
   // A thread where all the sync operations happen.