Revert 114236 - Options2: Pull the trigger.

chrome/browser/ui/webui/sync_setup_handler2.cc

Index: chrome/browser/ui/webui/sync_setup_handler2.cc
===================================================================
--- chrome/browser/ui/webui/sync_setup_handler2.cc	(revision 114238)
+++ chrome/browser/ui/webui/sync_setup_handler2.cc	(working copy)
@@ -1,772 +0,0 @@
-// 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/ui/webui/sync_setup_handler2.h"
-
-#include "base/bind.h"
-#include "base/bind_helpers.h"
-#include "base/json/json_reader.h"
-#include "base/json/json_writer.h"
-#include "base/metrics/histogram.h"
-#include "base/utf_string_conversions.h"
-#include "base/values.h"
-#include "chrome/browser/google/google_util.h"
-#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_info_cache.h"
-#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/profiles/profile_metrics.h"
-#include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/sync/protocol/service_constants.h"
-#include "chrome/browser/sync/signin_manager.h"
-#include "chrome/browser/sync/syncable/model_type.h"
-#include "chrome/browser/sync/sync_setup_flow.h"
-#include "chrome/browser/sync/util/oauth.h"
-#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/webui/sync_promo_trial.h"
-#include "chrome/browser/ui/webui/sync_promo_ui.h"
-#include "chrome/browser/ui/webui/user_selectable_sync_type.h"
-#include "chrome/common/net/gaia/gaia_constants.h"
-#include "chrome/common/pref_names.h"
-#include "chrome/common/url_constants.h"
-#include "content/browser/tab_contents/tab_contents.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
-#include "grit/locale_settings.h"
-#include "ui/base/l10n/l10n_util.h"
-
-using l10n_util::GetStringFUTF16;
-using l10n_util::GetStringUTF16;
-
-namespace {
-
-bool GetAuthData(const std::string& json,
-                 std::string* username,
-                 std::string* password,
-                 std::string* captcha,
-                 std::string* access_code) {
-  scoped_ptr<Value> parsed_value(base::JSONReader::Read(json, false));
-  if (!parsed_value.get() || !parsed_value->IsType(Value::TYPE_DICTIONARY))
-    return false;
-
-  DictionaryValue* result = static_cast<DictionaryValue*>(parsed_value.get());
-  if (!result->GetString("user", username) ||
-      !result->GetString("pass", password) ||
-      !result->GetString("captcha", captcha) ||
-      !result->GetString("access_code", access_code)) {
-      return false;
-  }
-  return true;
-}
-
-bool GetConfiguration(const std::string& json, SyncConfiguration* config) {
-  scoped_ptr<Value> parsed_value(base::JSONReader::Read(json, false));
-  if (!parsed_value.get() || !parsed_value->IsType(Value::TYPE_DICTIONARY))
-    return false;
-
-  DictionaryValue* result = static_cast<DictionaryValue*>(parsed_value.get());
-  if (!result->GetBoolean("syncAllDataTypes", &config->sync_everything))
-    return false;
-
-  // These values need to be kept in sync with where they are written in
-  // choose_datatypes.html.
-  bool sync_bookmarks;
-  if (!result->GetBoolean("syncBookmarks", &sync_bookmarks))
-    return false;
-  if (sync_bookmarks)
-    config->data_types.Put(syncable::BOOKMARKS);
-
-  bool sync_preferences;
-  if (!result->GetBoolean("syncPreferences", &sync_preferences))
-    return false;
-  if (sync_preferences)
-    config->data_types.Put(syncable::PREFERENCES);
-
-  bool sync_themes;
-  if (!result->GetBoolean("syncThemes", &sync_themes))
-    return false;
-  if (sync_themes)
-    config->data_types.Put(syncable::THEMES);
-
-  bool sync_passwords;
-  if (!result->GetBoolean("syncPasswords", &sync_passwords))
-    return false;
-  if (sync_passwords)
-    config->data_types.Put(syncable::PASSWORDS);
-
-  bool sync_autofill;
-  if (!result->GetBoolean("syncAutofill", &sync_autofill))
-    return false;
-  if (sync_autofill)
-    config->data_types.Put(syncable::AUTOFILL);
-
-  bool sync_extensions;
-  if (!result->GetBoolean("syncExtensions", &sync_extensions))
-    return false;
-  if (sync_extensions) {
-    config->data_types.Put(syncable::EXTENSIONS);
-    config->data_types.Put(syncable::EXTENSION_SETTINGS);
-  }
-
-  bool sync_typed_urls;
-  if (!result->GetBoolean("syncTypedUrls", &sync_typed_urls))
-    return false;
-  if (sync_typed_urls)
-    config->data_types.Put(syncable::TYPED_URLS);
-
-  bool sync_sessions;
-  if (!result->GetBoolean("syncSessions", &sync_sessions))
-    return false;
-  if (sync_sessions)
-    config->data_types.Put(syncable::SESSIONS);
-
-  bool sync_apps;
-  if (!result->GetBoolean("syncApps", &sync_apps))
-    return false;
-  if (sync_apps) {
-    config->data_types.Put(syncable::APPS);
-    config->data_types.Put(syncable::APP_SETTINGS);
-  }
-
-  // Encryption settings.
-  if (!result->GetBoolean("encryptAllData", &config->encrypt_all))
-    return false;
-
-  // Passphrase settings.
-  bool have_passphrase;
-  if (!result->GetBoolean("usePassphrase", &have_passphrase))
-    return false;
-
-  if (have_passphrase) {
-    bool is_gaia;
-    if (!result->GetBoolean("isGooglePassphrase", &is_gaia))
-      return false;
-    std::string passphrase;
-    if (!result->GetString("passphrase", &passphrase))
-      return false;
-    // The user provided a passphrase - pass it off to SyncSetupFlow as either
-    // the secondary or GAIA passphrase as appropriate.
-    if (is_gaia) {
-      config->set_gaia_passphrase = true;
-      config->gaia_passphrase = passphrase;
-    } else {
-      config->set_secondary_passphrase = true;
-      config->secondary_passphrase = passphrase;
-    }
-  }
-  return true;
-}
-
-bool HasConfigurationChanged(const SyncConfiguration& config,
-                             Profile* profile) {
-  CHECK(profile);
-
-  // This function must be updated every time a new sync datatype is added to
-  // the sync preferences page.
-  COMPILE_ASSERT(17 == syncable::MODEL_TYPE_COUNT,
-                 UpdateCustomConfigHistogram);
-
-  // If service is null or if this is a first time configuration, return true.
-  ProfileSyncService* service = profile->GetProfileSyncService();
-  if (!service || !service->HasSyncSetupCompleted())
-    return true;
-
-  if ((config.set_secondary_passphrase || config.set_gaia_passphrase) &&
-      !service->IsUsingSecondaryPassphrase())
-    return true;
-
-  if (config.encrypt_all != service->EncryptEverythingEnabled())
-    return true;
-
-  PrefService* pref_service = profile->GetPrefs();
-  CHECK(pref_service);
-
-  if (config.sync_everything !=
-      pref_service->GetBoolean(prefs::kSyncKeepEverythingSynced))
-    return true;
-
-  // Only check the data types that are explicitly listed on the sync
-  // preferences page.
-  const syncable::ModelTypeSet types = config.data_types;
-  if (((types.Has(syncable::BOOKMARKS)) !=
-       pref_service->GetBoolean(prefs::kSyncBookmarks)) ||
-      ((types.Has(syncable::PREFERENCES)) !=
-       pref_service->GetBoolean(prefs::kSyncPreferences)) ||
-      ((types.Has(syncable::THEMES)) !=
-       pref_service->GetBoolean(prefs::kSyncThemes)) ||
-      ((types.Has(syncable::PASSWORDS)) !=
-       pref_service->GetBoolean(prefs::kSyncPasswords)) ||
-      ((types.Has(syncable::AUTOFILL)) !=
-       pref_service->GetBoolean(prefs::kSyncAutofill)) ||
-      ((types.Has(syncable::EXTENSIONS)) !=
-       pref_service->GetBoolean(prefs::kSyncExtensions)) ||
-      ((types.Has(syncable::TYPED_URLS)) !=
-       pref_service->GetBoolean(prefs::kSyncTypedUrls)) ||
-      ((types.Has(syncable::SESSIONS)) !=
-       pref_service->GetBoolean(prefs::kSyncSessions)) ||
-      ((types.Has(syncable::APPS)) !=
-       pref_service->GetBoolean(prefs::kSyncApps)))
-    return true;
-
-  return false;
-}
-
-bool GetPassphrase(const std::string& json, std::string* passphrase) {
-  scoped_ptr<Value> parsed_value(base::JSONReader::Read(json, false));
-  if (!parsed_value.get() || !parsed_value->IsType(Value::TYPE_DICTIONARY))
-    return false;
-
-  DictionaryValue* result = static_cast<DictionaryValue*>(parsed_value.get());
-  return result->GetString("passphrase", passphrase);
-}
-
-string16 NormalizeUserName(const string16& user) {
-  if (user.find_first_of(ASCIIToUTF16("@")) != string16::npos)
-    return user;
-  return user + ASCIIToUTF16("@") + ASCIIToUTF16(DEFAULT_SIGNIN_DOMAIN);
-}
-
-bool AreUserNamesEqual(const string16& user1, const string16& user2) {
-  return NormalizeUserName(user1) == NormalizeUserName(user2);
-}
-
-}  // namespace
-
-SyncSetupHandler2::SyncSetupHandler2(ProfileManager* profile_manager)
-    : flow_(NULL),
-      profile_manager_(profile_manager) {
-}
-
-SyncSetupHandler2::~SyncSetupHandler2() {
-  // This case is hit when the user performs a back navigation.
-  if (flow_)
-    flow_->OnDialogClosed("");
-}
-
-void SyncSetupHandler2::GetLocalizedValues(DictionaryValue* localized_strings) {
-  GetStaticLocalizedValues(localized_strings, web_ui_);
-}
-
-void SyncSetupHandler2::GetStaticLocalizedValues(
-    DictionaryValue* localized_strings,
-    WebUI* web_ui) {
-  DCHECK(localized_strings);
-
-  localized_strings->SetString(
-      "invalidPasswordHelpURL",
-      google_util::StringAppendGoogleLocaleParam(
-          chrome::kInvalidPasswordHelpURL));
-  localized_strings->SetString(
-      "cannotAccessAccountURL",
-      google_util::StringAppendGoogleLocaleParam(
-          chrome::kCanNotAccessAccountURL));
-  localized_strings->SetString(
-      "introduction",
-      GetStringFUTF16(IDS_SYNC_LOGIN_INTRODUCTION,
-                      GetStringUTF16(IDS_PRODUCT_NAME)));
-  localized_strings->SetString(
-      "chooseDataTypesInstructions",
-      GetStringFUTF16(IDS_SYNC_CHOOSE_DATATYPES_INSTRUCTIONS,
-                      GetStringUTF16(IDS_PRODUCT_NAME)));
-  localized_strings->SetString(
-      "encryptionInstructions",
-      GetStringFUTF16(IDS_SYNC_ENCRYPTION_INSTRUCTIONS,
-                      GetStringUTF16(IDS_PRODUCT_NAME)));
-  localized_strings->SetString(
-      "encryptionHelpURL",
-      google_util::StringAppendGoogleLocaleParam(
-          chrome::kSyncEncryptionHelpURL));
-  localized_strings->SetString(
-      "passphraseEncryptionMessage",
-      GetStringFUTF16(IDS_SYNC_PASSPHRASE_ENCRYPTION_MESSAGE,
-                      GetStringUTF16(IDS_PRODUCT_NAME)));
-  localized_strings->SetString(
-      "passphraseRecover",
-      GetStringFUTF16(IDS_SYNC_PASSPHRASE_RECOVER,
-                      ASCIIToUTF16(google_util::StringAppendGoogleLocaleParam(
-                          chrome::kSyncGoogleDashboardURL))));
-  localized_strings->SetString(
-      "promoTitle",
-      GetStringFUTF16(IDS_SYNC_PROMO_TITLE,
-                      GetStringUTF16(IDS_PRODUCT_NAME)));
-  localized_strings->SetString(
-      "promoMessageTitle",
-      GetStringFUTF16(IDS_SYNC_PROMO_MESSAGE_TITLE,
-                      GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
-  localized_strings->SetString(
-      "syncEverythingHelpURL",
-      google_util::StringAppendGoogleLocaleParam(
-          chrome::kSyncEverythingLearnMoreURL));
-
-  // The experimental body string only appears if we are on the launch page
-  // version of the Sync Promo.
-  int message_body_resource_id = IDS_SYNC_PROMO_MESSAGE_BODY_A;
-  if (web_ui && SyncPromoUI::GetIsLaunchPageForSyncPromoURL(
-      web_ui->tab_contents()->GetURL())) {
-    message_body_resource_id = sync_promo_trial::GetMessageBodyResID();
-  }
-  localized_strings->SetString(
-      "promoMessageBody",
-      GetStringUTF16(message_body_resource_id));
-
-  std::string create_account_url = google_util::StringAppendGoogleLocaleParam(
-      chrome::kSyncCreateNewAccountURL);
-  string16 create_account = GetStringUTF16(IDS_SYNC_CREATE_ACCOUNT);
-  create_account= UTF8ToUTF16("<a id='create-account-link' target='_blank' "
-      "class='account-link' href='" + create_account_url + "'>") +
-      create_account + UTF8ToUTF16("</a>");
-  localized_strings->SetString("createAccountLinkHTML",
-      GetStringFUTF16(IDS_SYNC_CREATE_ACCOUNT_PREFIX, create_account));
-
-  static OptionsStringResource resources[] = {
-    { "syncSetupOverlayTitle", IDS_SYNC_SETUP_TITLE },
-    { "syncSetupConfigureTitle", IDS_SYNC_SETUP_CONFIGURE_TITLE },
-    { "cannotBeBlank", IDS_SYNC_CANNOT_BE_BLANK },
-    { "emailLabel", IDS_SYNC_LOGIN_EMAIL_NEW_LINE },
-    { "passwordLabel", IDS_SYNC_LOGIN_PASSWORD_NEW_LINE },
-    { "invalidCredentials", IDS_SYNC_INVALID_USER_CREDENTIALS },
-    { "signin", IDS_SYNC_SIGNIN },
-    { "couldNotConnect", IDS_SYNC_LOGIN_COULD_NOT_CONNECT },
-    { "unrecoverableError", IDS_SYNC_UNRECOVERABLE_ERROR },
-    { "errorLearnMore", IDS_LEARN_MORE },
-    { "unrecoverableErrorHelpURL", IDS_SYNC_UNRECOVERABLE_ERROR_HELP_URL },
-    { "cannotAccessAccount", IDS_SYNC_CANNOT_ACCESS_ACCOUNT },
-    { "cancel", IDS_CANCEL },
-    { "settingUp", IDS_SYNC_LOGIN_SETTING_UP },
-    { "errorSigningIn", IDS_SYNC_ERROR_SIGNING_IN },
-    { "signinHeader", IDS_SYNC_PROMO_SIGNIN_HEADER},
-    { "captchaInstructions", IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS },
-    { "invalidAccessCode", IDS_SYNC_INVALID_ACCESS_CODE_LABEL },
-    { "enterAccessCode", IDS_SYNC_ENTER_ACCESS_CODE_LABEL },
-    { "getAccessCodeHelp", IDS_SYNC_ACCESS_CODE_HELP_LABEL },
-    { "getAccessCodeURL", IDS_SYNC_GET_ACCESS_CODE_URL },
-    { "syncAllDataTypes", IDS_SYNC_EVERYTHING },
-    { "chooseDataTypes", IDS_SYNC_CHOOSE_DATATYPES },
-    { "bookmarks", IDS_SYNC_DATATYPE_BOOKMARKS },
-    { "preferences", IDS_SYNC_DATATYPE_PREFERENCES },
-    { "autofill", IDS_SYNC_DATATYPE_AUTOFILL },
-    { "themes", IDS_SYNC_DATATYPE_THEMES },
-    { "passwords", IDS_SYNC_DATATYPE_PASSWORDS },
-    { "extensions", IDS_SYNC_DATATYPE_EXTENSIONS },
-    { "typedURLs", IDS_SYNC_DATATYPE_TYPED_URLS },
-    { "apps", IDS_SYNC_DATATYPE_APPS },
-    { "openTabs", IDS_SYNC_DATATYPE_TABS },
-    { "syncZeroDataTypesError", IDS_SYNC_ZERO_DATA_TYPES_ERROR },
-    { "serviceUnavailableError", IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR },
-    { "encryptAllLabel", IDS_SYNC_ENCRYPT_ALL_LABEL },
-    { "googleOption", IDS_SYNC_PASSPHRASE_OPT_GOOGLE },
-    { "explicitOption", IDS_SYNC_PASSPHRASE_OPT_EXPLICIT },
-    { "sectionGoogleMessage", IDS_SYNC_PASSPHRASE_MSG_GOOGLE },
-    { "sectionExplicitMessage", IDS_SYNC_PASSPHRASE_MSG_EXPLICIT },
-    { "passphraseLabel", IDS_SYNC_PASSPHRASE_LABEL },
-    { "confirmLabel", IDS_SYNC_CONFIRM_PASSPHRASE_LABEL },
-    { "emptyErrorMessage", IDS_SYNC_EMPTY_PASSPHRASE_ERROR },
-    { "mismatchErrorMessage", IDS_SYNC_PASSPHRASE_MISMATCH_ERROR },
-    { "passphraseWarning", IDS_SYNC_PASSPHRASE_WARNING },
-    { "customizeLinkLabel", IDS_SYNC_CUSTOMIZE_LINK_LABEL },
-    { "confirmSyncPreferences", IDS_SYNC_CONFIRM_SYNC_PREFERENCES },
-    { "syncEverything", IDS_SYNC_SYNC_EVERYTHING },
-    { "useDefaultSettings", IDS_SYNC_USE_DEFAULT_SETTINGS },
-    { "passphraseSectionTitle", IDS_SYNC_PASSPHRASE_SECTION_TITLE },
-    { "privacyDashboardLink", IDS_SYNC_PRIVACY_DASHBOARD_LINK_LABEL },
-    { "enterPassphraseTitle", IDS_SYNC_ENTER_PASSPHRASE_TITLE },
-    { "enterPassphraseBody", IDS_SYNC_ENTER_PASSPHRASE_BODY },
-    { "enterOtherPassphraseBody", IDS_SYNC_ENTER_OTHER_PASSPHRASE_BODY },
-    { "enterGooglePassphraseBody", IDS_SYNC_ENTER_GOOGLE_PASSPHRASE_BODY },
-    { "passphraseLabel", IDS_SYNC_PASSPHRASE_LABEL },
-    { "incorrectPassphrase", IDS_SYNC_INCORRECT_PASSPHRASE },
-    { "passphraseWarning", IDS_SYNC_PASSPHRASE_WARNING },
-    { "cancelWarningHeader", IDS_SYNC_PASSPHRASE_CANCEL_WARNING_HEADER },
-    { "cancelWarning", IDS_SYNC_PASSPHRASE_CANCEL_WARNING },
-    { "yes", IDS_SYNC_PASSPHRASE_CANCEL_YES },
-    { "no", IDS_SYNC_PASSPHRASE_CANCEL_NO },
-    { "sectionExplicitMessagePrefix", IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_PREFIX },
-    { "sectionExplicitMessagePostfix",
-        IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_POSTFIX },
-    { "encryptedDataTypesTitle", IDS_SYNC_ENCRYPTION_DATA_TYPES_TITLE },
-    { "encryptSensitiveOption", IDS_SYNC_ENCRYPT_SENSITIVE_DATA },
-    { "encryptAllOption", IDS_SYNC_ENCRYPT_ALL_DATA },
-    { "encryptAllOption", IDS_SYNC_ENCRYPT_ALL_DATA },
-    { "aspWarningText", IDS_SYNC_ASP_PASSWORD_WARNING_TEXT },
-    { "promoPageTitle", IDS_SYNC_PROMO_TAB_TITLE},
-    { "promoSkipButton", IDS_SYNC_PROMO_SKIP_BUTTON},
-    { "promoAdvanced", IDS_SYNC_PROMO_ADVANCED},
-    { "promoLearnMoreShow", IDS_SYNC_PROMO_LEARN_MORE_SHOW},
-    { "promoLearnMoreHide", IDS_SYNC_PROMO_LEARN_MORE_HIDE},
-    { "promoInformation", IDS_SYNC_PROMO_INFORMATION},
-  };
-
-  RegisterStrings(localized_strings, resources, arraysize(resources));
-}
-
-void SyncSetupHandler2::Initialize() {
-}
-
-void SyncSetupHandler2::OnGetOAuthTokenSuccess(const std::string& oauth_token) {
-  flow_->OnUserSubmittedOAuth(oauth_token);
-}
-
-void SyncSetupHandler2::OnGetOAuthTokenFailure(
-    const GoogleServiceAuthError& error) {
-  CloseSyncSetup();
-}
-
-void SyncSetupHandler2::RegisterMessages() {
-  web_ui_->RegisterMessageCallback("SyncSetupDidClosePage",
-      base::Bind(&SyncSetupHandler2::OnDidClosePage,
-                 base::Unretained(this)));
-  web_ui_->RegisterMessageCallback("SyncSetupSubmitAuth",
-      base::Bind(&SyncSetupHandler2::HandleSubmitAuth,
-                 base::Unretained(this)));
-  web_ui_->RegisterMessageCallback("SyncSetupConfigure",
-      base::Bind(&SyncSetupHandler2::HandleConfigure,
-                 base::Unretained(this)));
-  web_ui_->RegisterMessageCallback("SyncSetupPassphrase",
-      base::Bind(&SyncSetupHandler2::HandlePassphraseEntry,
-                 base::Unretained(this)));
-  web_ui_->RegisterMessageCallback("SyncSetupPassphraseCancel",
-      base::Bind(&SyncSetupHandler2::HandlePassphraseCancel,
-                 base::Unretained(this)));
-  web_ui_->RegisterMessageCallback("SyncSetupAttachHandler",
-      base::Bind(&SyncSetupHandler2::HandleAttachHandler,
-                 base::Unretained(this)));
-  web_ui_->RegisterMessageCallback("SyncSetupShowErrorUI",
-      base::Bind(&SyncSetupHandler2::HandleShowErrorUI,
-                 base::Unretained(this)));
-  web_ui_->RegisterMessageCallback("SyncSetupShowSetupUI",
-      base::Bind(&SyncSetupHandler2::HandleShowSetupUI,
-                 base::Unretained(this)));
-}
-
-// Ideal(?) solution here would be to mimic the ClientLogin overlay.  Since
-// this UI must render an external URL, that overlay cannot be used directly.
-// The current implementation is functional, but fails asthetically.
-// TODO(rickcam): Bug 90711: Update UI for OAuth sign-in flow
-void SyncSetupHandler2::ShowOAuthLogin() {
-  DCHECK(browser_sync::IsUsingOAuth());
-
-  Profile* profile = Profile::FromWebUI(web_ui_);
-  oauth_login_.reset(new GaiaOAuthFetcher(this,
-                                          profile->GetRequestContext(),
-                                          profile,
-                                          GaiaConstants::kSyncServiceOAuth));
-  oauth_login_->SetAutoFetchLimit(GaiaOAuthFetcher::OAUTH1_REQUEST_TOKEN);
-  oauth_login_->StartGetOAuthToken();
-}
-
-void SyncSetupHandler2::ShowGaiaLogin(const DictionaryValue& args) {
-  DCHECK(!browser_sync::IsUsingOAuth());
-  StringValue page("login");
-  web_ui_->CallJavascriptFunction(
-      "SyncSetupOverlay.showSyncSetupPage", page, args);
-}
-
-void SyncSetupHandler2::ShowGaiaSuccessAndClose() {
-  web_ui_->CallJavascriptFunction("SyncSetupOverlay.showSuccessAndClose");
-}
-
-void SyncSetupHandler2::ShowGaiaSuccessAndSettingUp() {
-  web_ui_->CallJavascriptFunction("SyncSetupOverlay.showSuccessAndSettingUp");
-}
-
-void SyncSetupHandler2::ShowConfigure(const DictionaryValue& args) {
-  StringValue page("configure");
-  web_ui_->CallJavascriptFunction(
-      "SyncSetupOverlay.showSyncSetupPage", page, args);
-}
-
-void SyncSetupHandler2::ShowPassphraseEntry(const DictionaryValue& args) {
-  StringValue page("passphrase");
-  web_ui_->CallJavascriptFunction(
-      "SyncSetupOverlay.showSyncSetupPage", page, args);
-}
-
-void SyncSetupHandler2::ShowSettingUp() {
-  StringValue page("settingUp");
-  web_ui_->CallJavascriptFunction(
-      "SyncSetupOverlay.showSyncSetupPage", page);
-}
-
-void SyncSetupHandler2::ShowSetupDone(const string16& user) {
-  StringValue page("done");
-  web_ui_->CallJavascriptFunction(
-      "SyncSetupOverlay.showSyncSetupPage", page);
-
-  // Suppress the sync promo once the user signs into sync. This way the user
-  // doesn't see the sync promo even if they sign out of sync later on.
-  SyncPromoUI::SetUserSkippedSyncPromo(Profile::FromWebUI(web_ui_));
-
-  Profile* profile = Profile::FromWebUI(web_ui_);
-  ProfileSyncService* service = profile->GetProfileSyncService();
-  if (!service->HasSyncSetupCompleted()) {
-    FilePath profile_file_path = profile->GetPath();
-    ProfileMetrics::LogProfileSyncSignIn(profile_file_path);
-  }
-}
-
-void SyncSetupHandler2::SetFlow(SyncSetupFlow* flow) {
-  flow_ = flow;
-}
-
-void SyncSetupHandler2::Focus() {
-  static_cast<RenderViewHostDelegate*>(web_ui_->tab_contents())->Activate();
-}
-
-void SyncSetupHandler2::OnDidClosePage(const ListValue* args) {
-  CloseSyncSetup();
-}
-
-void SyncSetupHandler2::HandleSubmitAuth(const ListValue* args) {
-  std::string json;
-  if (!args->GetString(0, &json)) {
-    NOTREACHED() << "Could not read JSON argument";
-    return;
-  }
-
-  if (json.empty())
-    return;
-
-  std::string username, password, captcha, access_code;
-  if (!GetAuthData(json, &username, &password, &captcha, &access_code)) {
-    // The page sent us something that we didn't understand.
-    // This probably indicates a programming error.
-    NOTREACHED();
-    return;
-  }
-
-  string16 error_message;
-  if (!IsLoginAuthDataValid(username, &error_message)) {
-    ShowLoginErrorMessage(error_message);
-    return;
-  }
-
-  if (flow_)
-    flow_->OnUserSubmittedAuth(username, password, captcha, access_code);
-}
-
-void SyncSetupHandler2::HandleConfigure(const ListValue* args) {
-  std::string json;
-  if (!args->GetString(0, &json)) {
-    NOTREACHED() << "Could not read JSON argument";
-    return;
-  }
-  if (json.empty()) {
-    NOTREACHED();
-    return;
-  }
-
-  SyncConfiguration configuration;
-  if (!GetConfiguration(json, &configuration)) {
-    // The page sent us something that we didn't understand.
-    // This probably indicates a programming error.
-    NOTREACHED();
-    return;
-  }
-
-  // We do not do UMA logging during unit tests.
-  if (web_ui_) {
-    Profile* profile = Profile::FromWebUI(web_ui_);
-    if (HasConfigurationChanged(configuration, profile)) {
-      UMA_HISTOGRAM_BOOLEAN("Sync.SyncEverything",
-                            configuration.sync_everything);
-      if (!configuration.sync_everything) {
-        // Only log the data types that are explicitly listed on the sync
-        // preferences page.
-        const syncable::ModelTypeSet types = configuration.data_types;
-        if (types.Has(syncable::BOOKMARKS))
-          UMA_HISTOGRAM_ENUMERATION(
-              "Sync.CustomSync", BOOKMARKS, SELECTABLE_DATATYPE_COUNT + 1);
-        if (types.Has(syncable::PREFERENCES))
-          UMA_HISTOGRAM_ENUMERATION(
-              "Sync.CustomSync", PREFERENCES, SELECTABLE_DATATYPE_COUNT + 1);
-        if (types.Has(syncable::PASSWORDS))
-          UMA_HISTOGRAM_ENUMERATION(
-              "Sync.CustomSync", PASSWORDS, SELECTABLE_DATATYPE_COUNT + 1);
-        if (types.Has(syncable::AUTOFILL))
-          UMA_HISTOGRAM_ENUMERATION(
-              "Sync.CustomSync", AUTOFILL, SELECTABLE_DATATYPE_COUNT + 1);
-        if (types.Has(syncable::THEMES))
-          UMA_HISTOGRAM_ENUMERATION(
-              "Sync.CustomSync", THEMES, SELECTABLE_DATATYPE_COUNT + 1);
-        if (types.Has(syncable::TYPED_URLS))
-          UMA_HISTOGRAM_ENUMERATION(
-              "Sync.CustomSync", TYPED_URLS, SELECTABLE_DATATYPE_COUNT + 1);
-        if (types.Has(syncable::EXTENSIONS))
-          UMA_HISTOGRAM_ENUMERATION(
-              "Sync.CustomSync", EXTENSIONS, SELECTABLE_DATATYPE_COUNT + 1);
-        if (types.Has(syncable::SESSIONS))
-          UMA_HISTOGRAM_ENUMERATION(
-              "Sync.CustomSync", SESSIONS, SELECTABLE_DATATYPE_COUNT + 1);
-        if (types.Has(syncable::APPS))
-          UMA_HISTOGRAM_ENUMERATION(
-              "Sync.CustomSync", APPS, SELECTABLE_DATATYPE_COUNT + 1);
-        COMPILE_ASSERT(17 == syncable::MODEL_TYPE_COUNT,
-                       UpdateCustomConfigHistogram);
-        COMPILE_ASSERT(9 == SELECTABLE_DATATYPE_COUNT,
-                       UpdateCustomConfigHistogram);
-      }
-      UMA_HISTOGRAM_BOOLEAN("Sync.EncryptAllData", configuration.encrypt_all);
-      UMA_HISTOGRAM_BOOLEAN("Sync.CustomPassphrase",
-                            configuration.set_gaia_passphrase ||
-                            configuration.set_secondary_passphrase);
-    }
-  }
-
-  DCHECK(flow_);
-  flow_->OnUserConfigured(configuration);
-
-  ProfileMetrics::LogProfileSyncInfo(ProfileMetrics::SYNC_CUSTOMIZE);
-  if (configuration.encrypt_all) {
-    ProfileMetrics::LogProfileSyncInfo(ProfileMetrics::SYNC_ENCRYPT);
-  }
-  if (configuration.set_secondary_passphrase) {
-    ProfileMetrics::LogProfileSyncInfo(ProfileMetrics::SYNC_PASSPHRASE);
-  }
-  if (!configuration.sync_everything) {
-    ProfileMetrics::LogProfileSyncInfo(ProfileMetrics::SYNC_CHOOSE);
-  }
-}
-
-void SyncSetupHandler2::HandlePassphraseEntry(const ListValue* args) {
-  std::string json;
-  if (!args->GetString(0, &json)) {
-    NOTREACHED() << "Could not read JSON argument";
-    return;
-  }
-
-  if (json.empty())
-    return;
-
-  std::string passphrase;
-  if (!GetPassphrase(json, &passphrase)) {
-    // Couldn't understand what the page sent.  Indicates a programming error.
-    NOTREACHED();
-    return;
-  }
-
-  DCHECK(flow_);
-  flow_->OnPassphraseEntry(passphrase);
-}
-
-void SyncSetupHandler2::HandlePassphraseCancel(const ListValue* args) {
-  DCHECK(flow_);
-  flow_->OnPassphraseCancel();
-}
-
-void SyncSetupHandler2::HandleAttachHandler(const ListValue* args) {
-  OpenSyncSetup();
-}
-
-void SyncSetupHandler2::HandleShowErrorUI(const ListValue* args) {
-  DCHECK(!flow_);
-
-  Profile* profile = Profile::FromWebUI(web_ui_);
-  ProfileSyncService* service = profile->GetProfileSyncService();
-  DCHECK(service);
-
-  service->ShowErrorUI();
-}
-
-void SyncSetupHandler2::HandleShowSetupUI(const ListValue* args) {
-  DCHECK(!flow_);
-  if (FocusExistingWizard()) {
-    CloseOverlay();
-    return;
-  }
-  ShowSetupUI();
-}
-
-void SyncSetupHandler2::CloseSyncSetup() {
-  if (flow_) {
-    flow_->OnDialogClosed(std::string());
-    flow_ = NULL;
-  }
-}
-
-void SyncSetupHandler2::OpenSyncSetup() {
-  DCHECK(web_ui_);
-  DCHECK(!flow_);
-
-  Profile* profile = Profile::FromWebUI(web_ui_);
-  ProfileSyncService* service = profile->GetProfileSyncService();
-  if (!service) {
-    // If there's no sync service, the user tried to manually invoke a syncSetup
-    // URL, but sync features are disabled.  We need to close the overlay for
-    // this (rare) case.
-    CloseOverlay();
-    return;
-  }
-
-  // If the wizard is already visible, it must be attached to another flow
-  // handler.
-  if (FocusExistingWizard()) {
-    CloseOverlay();
-    return;
-  }
-
-  // Attach this as the sync setup handler, before calling ShowSetupUI().
-  if (!service->get_wizard().AttachSyncSetupHandler(this)) {
-    LOG(ERROR) << "SyncSetupHandler attach failed!";
-    CloseOverlay();
-    return;
-  }
-
-  ShowSetupUI();
-}
-
-// Private member functions.
-
-bool SyncSetupHandler2::FocusExistingWizard() {
-  Profile* profile = Profile::FromWebUI(web_ui_);
-  ProfileSyncService* service = profile->GetProfileSyncService();
-  if (!service)
-    return false;
-
-  // If the wizard is already visible, focus it.
-  if (service->get_wizard().IsVisible()) {
-    service->get_wizard().Focus();
-    return true;
-  }
-  return false;
-}
-
-void SyncSetupHandler2::CloseOverlay() {
-  web_ui_->CallJavascriptFunction("OptionsPage.closeOverlay");
-}
-
-bool SyncSetupHandler2::IsLoginAuthDataValid(const std::string& username,
-                                            string16* error_message) {
-  // Happens during unit tests.
-  if (!web_ui_ || !profile_manager_)
-    return true;
-
-  if (username.empty())
-    return true;
-
-  // Check if the username is already in use by another profile.
-  const ProfileInfoCache& cache = profile_manager_->GetProfileInfoCache();
-  size_t current_profile_index = cache.GetIndexOfProfileWithPath(
-      Profile::FromWebUI(web_ui_)->GetPath());
-  string16 username_utf16 = UTF8ToUTF16(username);
-
-  for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {
-    if (i != current_profile_index && AreUserNamesEqual(
-        cache.GetUserNameOfProfileAtIndex(i), username_utf16)) {
-      *error_message = l10n_util::GetStringUTF16(
-          IDS_SYNC_USER_NAME_IN_USE_ERROR);
-      return false;
-    }
-  }
-
-  return true;
-}
-
-void SyncSetupHandler2::ShowLoginErrorMessage(const string16& error_message) {
-  DictionaryValue args;
-  Profile* profile = Profile::FromWebUI(web_ui_);
-  ProfileSyncService* service = profile->GetProfileSyncService();
-  SyncSetupFlow::GetArgsForGaiaLogin(service, &args);
-  args.SetString("error_message", error_message);
-  ShowGaiaLogin(args);
-}