Added support for setting gaia_passphrase in SyncSetupFlow::OnUserConfigured.

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 255 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.gaia_passphrase.empty()) {
+    // Caller passed a gaia passphrase. This is illegal if we are currently
+    // using a secondary passphrase.
+    DCHECK(!service_->IsUsingSecondaryPassphrase());
+    service_->SetPassphrase(configuration.gaia_passphrase, false, false);
+  }
+
   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;
     }
   }
 
@@ skipping 141 matching lines @@
       break;
     }
     case SyncSetupWizard::DONE:
       flow_handler_->ShowSetupDone(
           UTF16ToWide(service_->GetAuthenticatedUsername()));
       break;
     default:
       NOTREACHED() << "Invalid advance state: " << state;
   }
 }