Refactor sync passphrase setup flow and fix passphrase tests

chrome/browser/sync/js_sync_manager_observer.cc

Index: chrome/browser/sync/js_sync_manager_observer.cc
diff --git a/chrome/browser/sync/js_sync_manager_observer.cc b/chrome/browser/sync/js_sync_manager_observer.cc
index ef9f34d52352d9bcfe2e2591a852b9cbf0b08bed..a86178a979c8ad4e5a266c0e95b129d9c948c66b 100644
--- a/chrome/browser/sync/js_sync_manager_observer.cc
+++ b/chrome/browser/sync/js_sync_manager_observer.cc
@@ -71,17 +71,16 @@ void JsSyncManagerObserver::OnUpdatedToken(const std::string& token) {
                                JsArgList(return_args), NULL);
 }
 
-void JsSyncManagerObserver::OnPassphraseRequired(bool for_decryption) {
+void JsSyncManagerObserver::OnPassphraseRequired(
+    sync_api::PassphraseRequiredReason reason) {
   ListValue return_args;
-  return_args.Append(Value::CreateBooleanValue(for_decryption));
+
+  return_args.Append(Value::CreateStringValue(
+      sync_api::PassphraseRequiredReasonToString(reason)));
   parent_router_->RouteJsEvent("onPassphraseRequired",
                                JsArgList(return_args), NULL);
 }
 
-void JsSyncManagerObserver::OnPassphraseFailed() {
-  parent_router_->RouteJsEvent("onPassphraseFailed", JsArgList(), NULL);
-}
-
 void JsSyncManagerObserver::OnPassphraseAccepted(
     const std::string& bootstrap_token) {
   ListValue return_args;