Refactor sync passphrase setup flow and fix passphrase tests

chrome/browser/sync/js_sync_manager_observer.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/sync/js_sync_manager_observer.h"
 
 #include <cstddef>
 
 #include "base/logging.h"
 #include "base/values.h"
@@ skipping 53 matching lines @@
                                JsArgList(return_args), NULL);
 }
 
 void JsSyncManagerObserver::OnUpdatedToken(const std::string& token) {
   ListValue return_args;
   return_args.Append(Value::CreateStringValue("<redacted>"));
   parent_router_->RouteJsEvent("onUpdatedToken",
                                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;
   return_args.Append(Value::CreateStringValue("<redacted>"));
   parent_router_->RouteJsEvent("onPassphraseAccepted",
                                JsArgList(return_args), NULL);
 }
 
 void JsSyncManagerObserver::OnEncryptionComplete(
     const syncable::ModelTypeSet& encrypted_types) {
@@ skipping 25 matching lines @@
 void JsSyncManagerObserver::OnClearServerDataSucceeded() {
   parent_router_->RouteJsEvent("onClearServerDataSucceeded",
                                JsArgList(), NULL);
 }
 
 void JsSyncManagerObserver::OnClearServerDataFailed() {
   parent_router_->RouteJsEvent("onClearServerDataFailed", JsArgList(), NULL);
 }
 
 }  // namespace browser_sync