Refactor sync passphrase setup flow and fix passphrase tests

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.
 
 // TODO(jhawkins): Rewrite these tests to handle the new inlined sync UI.
 
 #include "chrome/browser/sync/sync_setup_wizard.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/profile_sync_factory_mock.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/browser/sync/sync_setup_flow_handler.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/browser_with_test_window_test.h"
 #include "chrome/test/test_browser_window.h"
@@ skipping 47 matching lines @@
   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 SetPassphraseRequiredReason(sync_api::PassphraseRequiredReason reason) {
+    passphrase_required_reason_ = reason;
   }
 
   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();
@@ skipping 237 matching lines @@
 #endif
   test_window_->CloseDialog();
 }
 
 TEST_F(SyncSetupWizardTest, DISABLED_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);
+  service_->SetPassphraseRequiredReason(sync_api::REASON_ENCRYPTION);
   wizard_->Step(SyncSetupWizard::ENTER_PASSPHRASE);
   EXPECT_EQ(SyncSetupWizard::ENTER_PASSPHRASE,
             test_window_->flow()->current_state_);
 #if 0
   ListValue value;
   value.Append(new StringValue("{\"passphrase\":\"myPassphrase\","
                                 "\"mode\":\"gaia\"}"));
   test_window_->flow()->flow_handler_->HandlePassphraseEntry(&value);
   EXPECT_EQ("myPassphrase", service_->passphrase_);
 #endif
@@ skipping 176 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