Fix some problems with the ENTER_PASSPHRASE state in sync setup....

chrome/browser/sync/sync_setup_wizard_unittest.cc

 // Copyright (c) 2010 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/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
@@ skipping 41 matching lines @@
   virtual void OnUserChoseDatatypes(bool sync_everything,
       const syncable::ModelTypeSet& chosen_types) {
     user_chose_data_types_ = true;
     chosen_data_types_ = chosen_types;
   }
 
   virtual void OnUserCancelledDialog() {
     user_cancelled_dialog_ = true;
   }
 
+  virtual void SetSecondaryPassphrase(const std::string& passphrase) {
+    passphrase_ = passphrase;
+  }
+
   virtual string16 GetAuthenticatedUsername() const {
     return UTF8ToUTF16(username_);
   }
 
   void set_auth_state(const std::string& last_email,
                       const AuthError& error) {
     last_attempted_user_email_ = last_email;
     last_auth_error_ = error;
   }
 
+  void set_passphrase_required(bool required) {
+    observed_passphrase_required_ = required;
+  }
+
   void ResetTestStats() {
     username_.clear();
     password_.clear();
     captcha_.clear();
     user_cancelled_dialog_ = false;
     user_chose_data_types_ = false;
     keep_everything_synced_ = false;
     chosen_data_types_.clear();
   }
 
   std::string username_;
   std::string password_;
   std::string captcha_;
   bool user_cancelled_dialog_;
   bool user_chose_data_types_;
   bool keep_everything_synced_;
   syncable::ModelTypeSet chosen_data_types_;
 
+  std::string passphrase_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceForWizardTest);
 };
 
 class TestingProfileWithSyncService : public TestingProfile {
  public:
   TestingProfileWithSyncService() {
     sync_service_.reset(new ProfileSyncServiceForWizardTest(&factory_, this));
   }
 
@@ skipping 224 matching lines @@
   EXPECT_EQ(service_->chosen_data_types_.count(syncable::THEMES), 0U);
   EXPECT_EQ(service_->chosen_data_types_.count(syncable::PASSWORDS), 0U);
   EXPECT_EQ(service_->chosen_data_types_.count(syncable::AUTOFILL), 0U);
   EXPECT_EQ(service_->chosen_data_types_.count(syncable::EXTENSIONS), 0U);
   EXPECT_EQ(service_->chosen_data_types_.count(syncable::TYPED_URLS), 1U);
   EXPECT_EQ(service_->chosen_data_types_.count(syncable::APPS), 1U);
 
   test_window_->CloseDialog();
 }
 
+TEST_F(SyncSetupWizardTest, EnterPassphraseRequired) {
+  SKIP_TEST_ON_MACOSX();
+  wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
+  wizard_->Step(SyncSetupWizard::GAIA_SUCCESS);
+  wizard_->Step(SyncSetupWizard::CONFIGURE);
+  wizard_->Step(SyncSetupWizard::SETTING_UP);
+  service_->set_passphrase_required(true);
+  wizard_->Step(SyncSetupWizard::ENTER_PASSPHRASE);
+  EXPECT_EQ(SyncSetupWizard::ENTER_PASSPHRASE,
+            test_window_->flow()->current_state_);
+  ListValue value;
+  value.Append(new StringValue("{\"passphrase\":\"myPassphrase\"}"));
+  test_window_->flow()->flow_handler_->HandlePassphraseEntry(&value);
+  EXPECT_EQ("myPassphrase", service_->passphrase_);
+}
+
 TEST_F(SyncSetupWizardTest, DialogCancelled) {
   SKIP_TEST_ON_MACOSX();
   wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
   // Simulate the user closing the dialog.
   test_window_->CloseDialog();
   EXPECT_FALSE(wizard_->IsVisible());
   EXPECT_TRUE(service_->user_cancelled_dialog_);
   EXPECT_EQ(std::string(), service_->username_);
   EXPECT_EQ(std::string(), service_->password_);
 
@@ skipping 145 matching lines @@
   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());
 
   wizard_->Step(SyncSetupWizard::GAIA_SUCCESS);
   EXPECT_TRUE(test_window_->TestAndResetWasShowHTMLDialogCalled());
 }
 
 #undef SKIP_TEST_ON_MACOSX