FYI: Control Data + Per-Device Metadata

chrome/browser/sync/glue/sync_backend_host.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_SYNC_BACKEND_HOST_H_
 #define CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 213 matching lines @@
   void Shutdown(bool sync_disabled);
 
   // Changes the set of data types that are currently being synced.
   // The ready_task will be run when configuration is done with the
   // set of all types that failed configuration (i.e., if its argument
   // is non-empty, then an error was encountered).
   virtual void ConfigureDataTypes(
       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;
 
   // Turns on encryption of all present and future sync data.
   virtual void EnableEncryptEverything();
 
   // Activates change processing for the given data type.  This must
   // be called synchronously with the data type's model association so
   // no changes are dropped between model association and change
   // processor activation.
@@ skipping 117 matching lines @@
   class Core;
 
   // An enum representing the steps to initializing the SyncBackendHost.
   enum InitializationState {
     NOT_ATTEMPTED,
     CREATING_SYNC_MANAGER,  // We're waiting for the first callback from the
                             // sync thread to inform us that the sync manager
                             // 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.
   };
 
   // Enum used to distinguish which bootstrap encryption token is being updated.
   enum BootstrapTokenType {
     PASSPHRASE_BOOTSTRAP_TOKEN,
     KEYSTORE_BOOTSTRAP_TOKEN
   };
 
   // Checks if we have received a notice to turn on experimental datatypes
@@ skipping 83 matching lines @@
   // syncer::SyncNotifierObserver-like functions.
   void HandleNotificationsEnabledOnFrontendLoop();
   void HandleNotificationsDisabledOnFrontendLoop(
       syncer::NotificationsDisabledReason reason);
   void HandleIncomingNotificationOnFrontendLoop(
       const syncer::ObjectIdPayloadMap& id_payloads,
       syncer::IncomingNotificationSource source);
 
   // 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.
   void StopSyncManagerForShutdown(const base::Closure& closure);
 
   base::WeakPtrFactory<SyncBackendHost> weak_ptr_factory_;
 
   // A thread where all the sync operations happen.
   base::Thread sync_thread_;
 
@@ skipping 38 matching lines @@
 
   // UI-thread cache of the last SyncSessionSnapshot received from syncapi.
   syncer::sessions::SyncSessionSnapshot last_snapshot_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncBackendHost);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_