[Sync] Add SyncEncryptionHandler

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 bafe1402f07628a69c6ba5e6ba88ab556163d912..25bde7dfafd193a78bbdf813efe307fb14f10194 100644
--- a/chrome/browser/sync/glue/sync_backend_host.h
+++ b/chrome/browser/sync/glue/sync_backend_host.h
@@ -22,6 +22,7 @@
 #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"
@@ -369,11 +370,10 @@ class SyncBackendHost : public BackendDataTypeConfigurer {
     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.
   };
 
@@ -477,7 +477,7 @@ class SyncBackendHost : public BackendDataTypeConfigurer {
 
   // 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.