[Sync] Support receiving early passphrase required information in Sync UI.

chrome/browser/sync/sync_setup_flow.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/sync_setup_flow.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 249 matching lines @@
     syncable::ModelTypeSet data_types;
     service_->GetRegisteredDataTypes(&data_types);
     service_->EncryptDataTypes(data_types);
   }
 
   // If we are activating the passphrase, we need to have one supplied.
   DCHECK(service_->IsUsingSecondaryPassphrase() ||
          !configuration.use_secondary_passphrase ||
          configuration.secondary_passphrase.length() > 0);
 
-  if (configuration.use_secondary_passphrase &&
-      !service_->IsUsingSecondaryPassphrase()) {
-    service_->SetPassphrase(configuration.secondary_passphrase, true, true);
-    tried_creating_explicit_passphrase_ = true;
+  if (configuration.use_secondary_passphrase) {
+    if (!service_->IsUsingSecondaryPassphrase()) {
+      service_->SetPassphrase(configuration.secondary_passphrase, true, true);
+      tried_creating_explicit_passphrase_ = true;
+    } else {
+      service_->SetPassphrase(configuration.secondary_passphrase, true, false);
+      tried_setting_explicit_passphrase_ = true;
+    }
   }
 
   service_->OnUserChoseDatatypes(configuration.sync_everything,
                                  configuration.data_types);
 }
 
 void SyncSetupFlow::OnPassphraseEntry(const std::string& passphrase) {
   Advance(SyncSetupWizard::SETTING_UP);
   service_->SetPassphrase(passphrase, true, false);
   tried_setting_explicit_passphrase_ = true;
@@ skipping 35 matching lines @@
     case SyncSetupWizard::GAIA_SUCCESS:
       return current_state_ == SyncSetupWizard::GAIA_LOGIN;
     case SyncSetupWizard::SYNC_EVERYTHING:
     case SyncSetupWizard::CONFIGURE:
       return current_state_ == SyncSetupWizard::GAIA_SUCCESS;
     case SyncSetupWizard::ENTER_PASSPHRASE:
       return current_state_ == SyncSetupWizard::SYNC_EVERYTHING ||
              current_state_ == SyncSetupWizard::CONFIGURE ||
              current_state_ == SyncSetupWizard::SETTING_UP;
     case SyncSetupWizard::SETUP_ABORTED_BY_PENDING_CLEAR:
-      return (current_state_ != SyncSetupWizard::GAIA_LOGIN &&
-              current_state_ != SyncSetupWizard::GAIA_SUCCESS);
+      return true;  // The server can abort whenever it wants.
     case SyncSetupWizard::SETTING_UP:
       return current_state_ == SyncSetupWizard::SYNC_EVERYTHING ||
              current_state_ == SyncSetupWizard::CONFIGURE ||
              current_state_ == SyncSetupWizard::ENTER_PASSPHRASE;
     case SyncSetupWizard::NONFATAL_ERROR:
     case SyncSetupWizard::FATAL_ERROR:
       return true;  // You can always hit the panic button.
     case SyncSetupWizard::DONE:
       return current_state_ == SyncSetupWizard::SETTING_UP ||
              current_state_ == SyncSetupWizard::ENTER_PASSPHRASE;
@@ skipping 68 matching lines @@
       break;
     }
     case SyncSetupWizard::DONE:
       flow_handler_->ShowSetupDone(
           UTF16ToWide(service_->GetAuthenticatedUsername()));
       break;
     default:
       NOTREACHED() << "Invalid advance state: " << state;
   }
 }