Revert 50902 - New HTML Sync Setup UI....

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 "chrome/browser/browser.h"
@@ skipping 17 matching lines @@
 typedef GoogleServiceAuthError AuthError;
 
 // A PSS subtype to inject.
 class ProfileSyncServiceForWizardTest : public ProfileSyncService {
  public:
   ProfileSyncServiceForWizardTest(ProfileSyncFactory* factory, Profile* profile)
       : ProfileSyncService(factory, profile, false),
         user_accepted_merge_and_sync_(false),
         user_cancelled_dialog_(false) {
     RegisterPreferences();
-    ResetTestStats();
   }
 
   virtual ~ProfileSyncServiceForWizardTest() { }
 
   virtual void OnUserSubmittedAuth(const std::string& username,
                                    const std::string& password,
                                    const std::string& captcha) {
     username_ = username;
     password_ = password;
     captcha_ = captcha;
   }
-
-  virtual void OnUserChoseDatatypes(bool sync_everything,
-      const syncable::ModelTypeSet& chosen_types) {
-    user_chose_data_types_ = true;
-    chosen_data_types_ = chosen_types;
-  }
-
   virtual void OnUserAcceptedMergeAndSync() {
     user_accepted_merge_and_sync_ = true;
   }
   virtual void OnUserCancelledDialog() {
     user_cancelled_dialog_ = true;
   }
 
   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 ResetTestStats() {
     username_.clear();
     password_.clear();
     captcha_.clear();
     user_accepted_merge_and_sync_ = false;
     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_accepted_merge_and_sync_;
   bool user_cancelled_dialog_;
-  bool user_chose_data_types_;
-  bool keep_everything_synced_;
-  syncable::ModelTypeSet chosen_data_types_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceForWizardTest);
 };
 
 class TestingProfileWithSyncService : public TestingProfile {
  public:
   TestingProfileWithSyncService() {
     sync_service_.reset(new ProfileSyncServiceForWizardTest(&factory_, this));
   }
@@ skipping 147 matching lines @@
 
   // 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_FALSE(test_window_->TestAndResetWasShowHTMLDialogCalled());
   EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, test_window_->flow()->current_state_);
   dialog_args.Clear();
   SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args);
-  EXPECT_EQ(5U, dialog_args.size());
-  std::string iframe_to_show;
-  dialog_args.GetString(L"iframeToShow", &iframe_to_show);
-  EXPECT_EQ("login", iframe_to_show);
+  EXPECT_EQ(4U, dialog_args.size());
   std::string actual_user;
   dialog_args.GetString(L"user", &actual_user);
   EXPECT_EQ(kTestUser, actual_user);
   int error = -1;
   dialog_args.GetInteger(L"error", &error);
   EXPECT_EQ(static_cast<int>(AuthError::INVALID_GAIA_CREDENTIALS), error);
   service_->set_auth_state(kTestUser, AuthError::None());
 
   // Simulate captcha.
   AuthError captcha_error(AuthError::FromCaptchaChallenge(
       std::string(), GURL(kTestCaptchaUrl), GURL()));
   service_->set_auth_state(kTestUser, captcha_error);
   wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
   SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args);
-  EXPECT_EQ(5U, dialog_args.size());
-  dialog_args.GetString(L"iframeToShow", &iframe_to_show);
-  EXPECT_EQ("login", iframe_to_show);
+  EXPECT_EQ(4U, dialog_args.size());
   std::string captcha_url;
   dialog_args.GetString(L"captchaUrl", &captcha_url);
   EXPECT_EQ(kTestCaptchaUrl, GURL(captcha_url).spec());
   error = -1;
   dialog_args.GetInteger(L"error", &error);
   EXPECT_EQ(static_cast<int>(AuthError::CAPTCHA_REQUIRED), error);
   service_->set_auth_state(kTestUser, AuthError::None());
 
   // Simulate success.
   wizard_->Step(SyncSetupWizard::GAIA_SUCCESS);
   EXPECT_TRUE(wizard_->IsVisible());
   EXPECT_FALSE(test_window_->TestAndResetWasShowHTMLDialogCalled());
-  // In a non-discrete run, GAIA_SUCCESS immediately transitions you to
-  // CHOOSE_DATA_TYPES.
-  EXPECT_EQ(SyncSetupWizard::CHOOSE_DATA_TYPES,
+  EXPECT_EQ(SyncSetupWizard::GAIA_SUCCESS,
             test_window_->flow()->current_state_);
 
-  // That's all we're testing here, just move on to DONE.  We'll test the
-  // "choose data types" scenarios elsewhere.
   wizard_->Step(SyncSetupWizard::DONE);  // No merge and sync.
   EXPECT_TRUE(wizard_->IsVisible());
   EXPECT_FALSE(test_window_->TestAndResetWasShowHTMLDialogCalled());
   EXPECT_EQ(SyncSetupWizard::DONE, test_window_->flow()->current_state_);
 }
 
-TEST_F(SyncSetupWizardTest, ChooseDataTypesSetsPrefs) {
-  SKIP_TEST_ON_MACOSX();
-  wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
-  wizard_->Step(SyncSetupWizard::CHOOSE_DATA_TYPES);
-
-  ListValue data_type_choices_value;
-  std::string data_type_choices = "{\"keepEverythingSynced\":false,";
-  data_type_choices += "\"syncBookmarks\":true,\"syncPreferences\":true,";
-  data_type_choices += "\"syncThemes\":false,\"syncPasswords\":false,";
-  data_type_choices += "\"syncAutofill\":false,\"syncExtensions\":false,";
-  data_type_choices += "\"syncTypedUrls\":true}";
-  data_type_choices_value.Append(new StringValue(data_type_choices));
-
-  // Simulate the user choosing data types; bookmarks and prefs are on, the rest
-  // are off.
-  test_window_->flow()->flow_handler_->HandleChooseDataTypes(
-      &data_type_choices_value);
-  EXPECT_TRUE(wizard_->IsVisible());
-  EXPECT_TRUE(test_window_->TestAndResetWasShowHTMLDialogCalled());
-  EXPECT_FALSE(service_->keep_everything_synced_);
-  EXPECT_EQ(service_->chosen_data_types_.count(syncable::BOOKMARKS), 1U);
-  EXPECT_EQ(service_->chosen_data_types_.count(syncable::PREFERENCES), 1U);
-  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);
-
-  test_window_->CloseDialog();
-}
-
 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_);
   EXPECT_FALSE(service_->user_accepted_merge_and_sync_);
@@ skipping 72 matching lines @@
   EXPECT_TRUE(test_window_->TestAndResetWasShowHTMLDialogCalled());
 
   wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
   EXPECT_EQ(SyncSetupWizard::GAIA_SUCCESS, test_window_->flow()->end_state_);
 
   AuthError invalid_gaia(AuthError::INVALID_GAIA_CREDENTIALS);
   service_->set_auth_state(kTestUser, invalid_gaia);
   wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
   EXPECT_TRUE(wizard_->IsVisible());
   SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args);
-  EXPECT_EQ(5U, dialog_args.size());
-  std::string iframe_to_show;
-  dialog_args.GetString(L"iframeToShow", &iframe_to_show);
-  EXPECT_EQ("login", iframe_to_show);
+  EXPECT_EQ(4U, dialog_args.size());
   std::string actual_user;
   dialog_args.GetString(L"user", &actual_user);
   EXPECT_EQ(kTestUser, actual_user);
   int error = -1;
   dialog_args.GetInteger(L"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