NOT FOR COMMIT: Add DeviceInfo type and ChangeProcessor

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 347 matching lines @@
 
   SyncFrontend* frontend() { return frontend_; }
 
  private:
   // The real guts of SyncBackendHost, to keep the public client API clean.
   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 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.
-    INITIALIZED,            // Initialization is complete.
+    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_CONTROL_TYPES, // The SyncManager is initialized, but
+                               // we're fetching metadata, such as encryption
+                               // information, from the server.
+    PROCESSING_CONTROL_TYPES,  // Running init tasks that require metadata to
+                               // be available.  This includes registering our
+                               // device information and refreshing encryption.
+    INITIALIZED,               // Initialization is complete.
   };
 
   // Checks if we have received a notice to turn on experimental datatypes
   // (via the nigori node) and informs the frontend if that is the case.
   // Note: it is illegal to call this before the backend is initialized.
   void AddExperimentalTypes();
 
   // Downloading of nigori failed and will be retried.
   void OnNigoriDownloadRetry();
 
@@ skipping 80 matching lines @@
   void HandleInvalidatorStateChangeOnFrontendLoop(
       syncer::InvalidatorState state);
   void HandleIncomingInvalidationOnFrontendLoop(
       const syncer::ObjectIdStateMap& id_state_map,
       syncer::IncomingInvalidationSource source);
 
   // Handles stopping the core's SyncManager, accounting for whether
   // initialization is done yet.
   void StopSyncManagerForShutdown(const base::Closure& closure);
 
+  // Must be called on |frontend_loop_|.  |done_callback| is called on
+  // |frontend_loop_|.
+  void InitialProcessControlTypes(const base::Closure& done_callback);
+
   base::WeakPtrFactory<SyncBackendHost> weak_ptr_factory_;
 
   // A thread where all the sync operations happen.
   base::Thread sync_thread_;
 
   // A reference to the MessageLoop used to construct |this|, so we know how
   // to safely talk back to the SyncFrontend.
   MessageLoop* const frontend_loop_;
 
   Profile* const profile_;
@@ skipping 45 matching lines @@
   // it via OnBackendInitialized in the final state of
   // HandleInitializationCompletedOnFrontendLoop.
   syncer::WeakHandle<syncer::JsBackend> js_backend_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncBackendHost);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_