FYI: Control Data + Per-Device Metadata

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 dd703b45417c6e40178ab6718bd913a1ce66da6f..4b1f2b581ebbe0e1c394350ae00630450565fd55 100644
--- a/chrome/browser/sync/glue/sync_backend_host.h
+++ b/chrome/browser/sync/glue/sync_backend_host.h
@@ -231,7 +231,6 @@ class SyncBackendHost : public BackendDataTypeConfigurer {
       syncer::ConfigureReason reason,
       syncer::ModelTypeSet types_to_add,
       syncer::ModelTypeSet types_to_remove,
-      NigoriState nigori_state,
       const base::Callback<void(syncer::ModelTypeSet)>& ready_task,
       const base::Callback<void()>& retry_callback) OVERRIDE;
 
@@ -369,12 +368,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 encryption information.
-    REFRESHING_NIGORI,      // The SyncManager is initialized, and we
-                            // have the encryption information, but we
-                            // still need to refresh encryption. Also, we need
-                            // to update the device information in the nigori.
+    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.
   };
 
@@ -478,7 +477,7 @@ class SyncBackendHost : public BackendDataTypeConfigurer {
 
   // Must be called on |frontend_loop_|.  |done_callback| is called on
   // |frontend_loop_|.
-  void RefreshNigori(const base::Closure& done_callback);
+  void InitialProcessMetadata(const base::Closure& done_callback);
 
   // Handles stopping the core's SyncManager, accounting for whether
   // initialization is done yet.