Moved the handling of the initial passphrase into SyncSetupFlow.

chrome/browser/sync/sync_setup_wizard_unittest.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_wizard.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 70 matching lines @@
       const syncable::ModelTypeSet& chosen_types) {
     user_chose_data_types_ = true;
     chosen_data_types_ = chosen_types;
   }
 
   virtual void OnUserCancelledDialog() {
     user_cancelled_dialog_ = true;
   }
 
   virtual void SetPassphrase(const std::string& passphrase,
-                             bool is_explicit,
-                             bool is_creation) {
+                             bool is_explicit) {
     passphrase_ = passphrase;
   }
 
   virtual string16 GetAuthenticatedUsername() const {
     return UTF8ToUTF16(username_);
   }
 
   virtual bool IsUsingSecondaryPassphrase() const {
     // The only value of |is_using_secondary_passphrase_| we current care about
     // is when it's true.
@@ skipping 125 matching lines @@
 
 #if defined(OS_MACOSX)
 #define SKIP_TEST_ON_MACOSX() \
   do { LOG(WARNING) << "Test skipped on OS X"; return; } while (0)
 #else
 #define SKIP_TEST_ON_MACOSX() do {} while (0)
 #endif
 
 TEST_F(SyncSetupWizardTest, InitialStepLogin) {
   SKIP_TEST_ON_MACOSX();
-  DictionaryValue dialog_args;
-  SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args);
-  std::string json_start_args;
-  base::JSONWriter::Write(&dialog_args, false, &json_start_args);
   ListValue credentials;
   std::string auth = "{\"user\":\"";
   auth += std::string(kTestUser) + "\",\"pass\":\"";
   auth += std::string(kTestPassword) + "\",\"captcha\":\"";
   auth += std::string(kTestCaptcha) + "\",\"access_code\":\"";
   auth += std::string() + "\"}";
   credentials.Append(new StringValue(auth));
 
   EXPECT_FALSE(wizard_->IsVisible());
   EXPECT_EQ(static_cast<SyncSetupFlow*>(NULL), flow_);
   wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
   AttachSyncSetupHandler();
 
   EXPECT_TRUE(wizard_->IsVisible());
   EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, flow_->current_state_);
   EXPECT_EQ(SyncSetupWizard::DONE, flow_->end_state_);
-  EXPECT_EQ(json_start_args, flow_->dialog_start_args_);
 
   // Simulate the user submitting credentials.
   handler_.HandleSubmitAuth(&credentials);
   EXPECT_TRUE(wizard_->IsVisible());
   EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, flow_->current_state_);
   EXPECT_EQ(kTestUser, service_->username_);
   EXPECT_EQ(kTestPassword, service_->password_);
   EXPECT_EQ(kTestCaptcha, service_->captcha_);
   EXPECT_FALSE(service_->user_cancelled_dialog_);
   service_->ResetTestStats();
 
   // Simulate failed credentials.
   AuthError invalid_gaia(AuthError::INVALID_GAIA_CREDENTIALS);
   service_->set_auth_state(kTestUser, invalid_gaia);
   wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
   EXPECT_TRUE(wizard_->IsVisible());
   EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, flow_->current_state_);
-  dialog_args.Clear();
+  DictionaryValue dialog_args;
   SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args);
   EXPECT_EQ(4U, dialog_args.size());
   std::string actual_user;
   dialog_args.GetString("user", &actual_user);
   EXPECT_EQ(kTestUser, actual_user);
   int error = -1;
   dialog_args.GetInteger("error", &error);
   EXPECT_EQ(static_cast<int>(AuthError::INVALID_GAIA_CREDENTIALS), error);
   service_->set_auth_state(kTestUser, AuthError::None());
 
@@ skipping 293 matching lines @@
       AuthError(GoogleServiceAuthError::SERVICE_UNAVAILABLE));
   wizard_->Step(SyncSetupWizard::NONFATAL_ERROR);
   AttachSyncSetupHandler();
   EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, flow_->current_state_);
   EXPECT_EQ(SyncSetupWizard::DONE, flow_->end_state_);
   CloseSetupUI();
   EXPECT_FALSE(wizard_->IsVisible());
 }
 
 #undef SKIP_TEST_ON_MACOSX