[Sync] Add SyncEncryptionHandler

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"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/sync/glue/backend_data_type_configurer.h"
 #include "chrome/browser/sync/glue/chrome_extensions_activity_monitor.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "googleurl/src/gurl.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/configure_reason.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"
+#include "sync/internal_api/public/sync_encryption_handler.h"
 #include "sync/internal_api/public/sync_manager.h"
 #include "sync/internal_api/public/util/report_unrecoverable_error_function.h"
 #include "sync/internal_api/public/util/unrecoverable_error_handler.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/notifier/sync_notifier_factory.h"
 #include "sync/notifier/sync_notifier_observer.h"
 #include "sync/protocol/encryption.pb.h"
 #include "sync/protocol/sync_protocol_error.h"
 
 class MessageLoop;
@@ skipping 327 matching lines @@
 
   // 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.
+                            // 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.
   };
 
   // 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 81 matching lines @@
       syncer::ModelTypeSet failed_configuration_types);
 
   // 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

[tim (not reviewing), 2012/08/15 00:23:30]

Comment references |done_callback|. 

[Nicolas Zea, 2012/08/15 01:08:29]

Done.

   // |frontend_loop_|.
-  void RefreshNigori(const base::Closure& done_callback);
+  void AssociateNigori(const syncer::WeakHandle<syncer::JsBackend>& js_backend);
 
   // 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_