3 files changed, 2 insertions, 54 deletions
diff --git a/chrome/browser/ui/webui/options/options_sync_setup_handler.cc b/chrome/browser/ui/webui/options/options_sync_setup_handler.cc
deleted file mode 100644
index f1b43f2c..0000000
--- a/chrome/browser/ui/webui/options/options_sync_setup_handler.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 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/options/options_sync_setup_handler.h"
-
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/sync/profile_sync_service_factory.h"
-#include "content/public/browser/web_ui.h"
-
-namespace options {
-
-OptionsSyncSetupHandler::OptionsSyncSetupHandler(
-    ProfileManager* profile_manager) : SyncSetupHandler(profile_manager) {
-}
-
-OptionsSyncSetupHandler::~OptionsSyncSetupHandler() {
-}
-
-void OptionsSyncSetupHandler::ShowSetupUI() {
-  // Show the Sync Setup page.
-  web_ui()->CallJavascriptFunction("OptionsPage.navigateToPage",
-                                   base::StringValue("syncSetup"));
-}
-
-}  // namespace options
diff --git a/chrome/browser/ui/webui/options/options_sync_setup_handler.h b/chrome/browser/ui/webui/options/options_sync_setup_handler.h
deleted file mode 100644
index 74855ef..0000000
--- a/chrome/browser/ui/webui/options/options_sync_setup_handler.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_SYNC_SETUP_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_SYNC_SETUP_HANDLER_H_
-
-#include "chrome/browser/ui/webui/sync_setup_handler.h"
-
-namespace options {
-
-// The handler for Javascript messages related to sync setup UI in the options
-// page.
-class OptionsSyncSetupHandler : public SyncSetupHandler {
- public:
-  explicit OptionsSyncSetupHandler(ProfileManager* profile_manager);
-  virtual ~OptionsSyncSetupHandler();
-
- protected:
-  virtual void ShowSetupUI() OVERRIDE;
-};
-
-}  // namespace options
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_SYNC_SETUP_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
index 85bac3b..7add1ee 100644
--- a/chrome/browser/ui/webui/options/options_ui.cc
+++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -39,11 +39,11 @@
 #include "chrome/browser/ui/webui/options/managed_user_learn_more_handler.h"
 #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h"
 #include "chrome/browser/ui/webui/options/media_galleries_handler.h"
-#include "chrome/browser/ui/webui/options/options_sync_setup_handler.h"
 #include "chrome/browser/ui/webui/options/password_manager_handler.h"
 #include "chrome/browser/ui/webui/options/reset_profile_settings_handler.h"
 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"
 #include "chrome/browser/ui/webui/options/startup_pages_handler.h"
+#include "chrome/browser/ui/webui/sync_setup_handler.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
@@ -277,7 +277,7 @@ OptionsUI::OptionsUI(content::WebUI* web_ui)
   AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());
   AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
   AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler());
-  AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler(
+  AddOptionsPageUIHandler(localized_strings, new SyncSetupHandler(
       g_browser_process->profile_manager()));
 #if defined(OS_CHROMEOS)
   AddOptionsPageUIHandler(localized_strings,