[Sync] Unrevert r75287 (initial support for sync encryption of all datatypes). Fix passphrase race.

BUG=73218,59242
TEST=unit,sync_unit,sync_integration

Review URL: http://codereview.chromium.org/6561001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75920 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 1 deletions

diff --git a/chrome/browser/sync/js_sync_manager_observer.cc b/chrome/browser/sync/js_sync_manager_observer.cc
index ef6eb06..3999fdd 100644
--- a/chrome/browser/sync/js_sync_manager_observer.cc
+++ b/chrome/browser/sync/js_sync_manager_observer.cc
@@ -12,7 +12,6 @@
 #include "chrome/browser/sync/js_event_router.h"
 #include "chrome/browser/sync/sessions/session_state.h"
 #include "chrome/browser/sync/syncable/model_type.h"
-#include "chrome/browser/sync/sessions/session_state.h"
 
 namespace browser_sync {
 
@@ -79,6 +78,10 @@ void JsSyncManagerObserver::OnPassphraseRequired(bool for_decryption) {
                                JsArgList(return_args), NULL);
 }
 
+void JsSyncManagerObserver::OnPassphraseFailed() {
+  parent_router_->RouteJsEvent("onPassphraseFailed", JsArgList(), NULL);
+}
+
 void JsSyncManagerObserver::OnPassphraseAccepted(
     const std::string& bootstrap_token) {
   ListValue return_args;
@@ -87,6 +90,14 @@ void JsSyncManagerObserver::OnPassphraseAccepted(
                                JsArgList(return_args), NULL);
 }
 
+void JsSyncManagerObserver::OnEncryptionComplete(
+    const syncable::ModelTypeSet& encrypted_types) {
+  ListValue return_args;
+  return_args.Append(syncable::ModelTypeSetToValue(encrypted_types));
+  parent_router_->RouteJsEvent("onEncryptionComplete",
+                               JsArgList(return_args), NULL);
+}
+
 void JsSyncManagerObserver::OnInitializationComplete() {
   parent_router_->RouteJsEvent("onInitializationComplete",
                                JsArgList(), NULL);