Revert 115057 - Moved all options2 files to the options2 namespace.

BUG=100885
TEST=everything compiles

Review URL: http://codereview.chromium.org/8947010

TBR=binji@chromium.org
Review URL: http://codereview.chromium.org/8989005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115060 0039d316-1c4b-4281-b951-d872f2087c98

112 files changed, 473 insertions, 788 deletions

diff --git a/chrome/browser/ui/webui/chrome_web_ui_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
index fe3c031..39f88e5 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
@@ -223,7 +223,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(TabContents* tab_contents,
   if (url.host() == chrome::kChromeUISettingsHost)
     return &NewWebUI<OptionsUI>;
   if (url.host() == chrome::kChromeUISettingsFrameHost)
-    return &NewWebUI<options2::OptionsUI>;
+    return &NewWebUI<Options2UI>;
   if (url.host() == chrome::kChromeUISyncInternalsHost)
     return &NewWebUI<SyncInternalsUI>;
   if (url.host() == chrome::kChromeUITaskManagerHost)
@@ -470,7 +470,7 @@ RefCountedMemory* ChromeWebUIFactory::GetFaviconResourceBytes(
     return OptionsUI::GetFaviconResourceBytes();
 
   if (page_url.host() == chrome::kChromeUISettingsFrameHost)
-    return options2::OptionsUI::GetFaviconResourceBytes();
+    return Options2UI::GetFaviconResourceBytes();
 
   if (page_url.host() == chrome::kChromeUIPluginsHost)
     return PluginsUI::GetFaviconResourceBytes();
diff --git a/chrome/browser/ui/webui/options2/advanced_options2_browsertest.js b/chrome/browser/ui/webui/options2/advanced_options_browsertest.js
index a929bbb..a929bbb 100644
--- a/chrome/browser/ui/webui/options2/advanced_options2_browsertest.js
+++ b/chrome/browser/ui/webui/options2/advanced_options_browsertest.js
diff --git a/chrome/browser/ui/webui/options2/advanced_options_handler2.cc b/chrome/browser/ui/webui/options2/advanced_options_handler.cc
index 72e6953..fbb8aed 100644
--- a/chrome/browser/ui/webui/options2/advanced_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/advanced_options_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/advanced_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/advanced_options_handler.h"
 
 #include <string>
 
@@ -43,13 +43,11 @@
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h"
-#include "chrome/browser/ui/webui/options2/advanced_options_utils2.h"
+#include "chrome/browser/ui/webui/options2/advanced_options_utils.h"
 #endif
 
 using content::UserMetricsAction;
 
-namespace options2 {
-
 AdvancedOptionsHandler::AdvancedOptionsHandler() {
 
 #if(!defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN))
@@ -229,7 +227,7 @@ void AdvancedOptionsHandler::Initialize() {
 
 WebUIMessageHandler* AdvancedOptionsHandler::Attach(WebUI* web_ui) {
   // Call through to superclass.
-  WebUIMessageHandler* handler = OptionsPageUIHandler::Attach(web_ui);
+  WebUIMessageHandler* handler = OptionsPage2UIHandler::Attach(web_ui);
 
   // Register for preferences that we need to observe manually.  These have
   // special behaviors that aren't handled by the standard prefs UI.
@@ -643,5 +641,3 @@ void AdvancedOptionsHandler::SetupSSLConfigSettings() {
         disabled);
   }
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/advanced_options_handler2.h b/chrome/browser/ui/webui/options2/advanced_options_handler.h
index da4eaed..3e404fa 100644
--- a/chrome/browser/ui/webui/options2/advanced_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/advanced_options_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_ADVANCED_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_ADVANCED_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_ADVANCED_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_ADVANCED_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/prefs/pref_member.h"
@@ -17,18 +17,16 @@
 
 class CloudPrintSetupHandler;
 
-namespace options2 {
-
 // Chrome advanced options page UI handler.
 class AdvancedOptionsHandler
-    : public OptionsPageUIHandler,
+    : public OptionsPage2UIHandler,
       public SelectFileDialog::Listener,
       public CloudPrintSetupHandlerDelegate {
  public:
   AdvancedOptionsHandler();
   virtual ~AdvancedOptionsHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
   virtual void Initialize() OVERRIDE;
 
@@ -181,6 +179,4 @@ class AdvancedOptionsHandler
   DISALLOW_COPY_AND_ASSIGN(AdvancedOptionsHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_ADVANCED_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_ADVANCED_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/advanced_options_utils2.h b/chrome/browser/ui/webui/options2/advanced_options_utils.h
index d784899..edaacf5 100644
--- a/chrome/browser/ui/webui/options2/advanced_options_utils2.h
+++ b/chrome/browser/ui/webui/options2/advanced_options_utils.h
@@ -2,15 +2,13 @@
 // 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_OPTIONS2_ADVANCED_OPTIONS_UTILS2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_ADVANCED_OPTIONS_UTILS2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_ADVANCED_OPTIONS_UTILS_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_ADVANCED_OPTIONS_UTILS_H_
 
 #include "base/basictypes.h"
 
 class TabContents;
 
-namespace options2 {
-
 // Chrome advanced options utility methods.
 class AdvancedOptionsUtilities {
  public:
@@ -24,6 +22,4 @@ class AdvancedOptionsUtilities {
   DISALLOW_IMPLICIT_CONSTRUCTORS(AdvancedOptionsUtilities);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_ADVANCED_OPTIONS_UTILS2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_ADVANCED_OPTIONS_UTILS_H_
diff --git a/chrome/browser/ui/webui/options2/advanced_options_utils2_mac.mm b/chrome/browser/ui/webui/options2/advanced_options_utils_mac.mm
index 8f2c174..c1e5b52 100644
--- a/chrome/browser/ui/webui/options2/advanced_options_utils2_mac.mm
+++ b/chrome/browser/ui/webui/options2/advanced_options_utils_mac.mm
@@ -4,13 +4,11 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "chrome/browser/ui/webui/options2/advanced_options_utils2.h"
+#include "chrome/browser/ui/webui/options2/advanced_options_utils.h"
 
 #include "base/logging.h"
 #include "base/mac/scoped_aedesc.h"
 
-namespace options2 {
-
 void AdvancedOptionsUtilities::ShowNetworkProxySettings(
       TabContents* tab_contents) {
   NSArray* itemsToOpen = [NSArray arrayWithObject:[NSURL fileURLWithPath:
@@ -41,4 +39,3 @@ void AdvancedOptionsUtilities::ShowManageSSLCertificates(
    launchIdentifier:nil];
 }
 
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/advanced_options_utils2_win.cc b/chrome/browser/ui/webui/options2/advanced_options_utils_win.cc
index 6c4d9fe..5942ff9 100644
--- a/chrome/browser/ui/webui/options2/advanced_options_utils2_win.cc
+++ b/chrome/browser/ui/webui/options2/advanced_options_utils_win.cc
@@ -2,7 +2,7 @@
 // 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/options2/advanced_options_utils2.h"
+#include "chrome/browser/ui/webui/options2/advanced_options_utils.h"
 
 #include <windows.h>
 #include <cryptuiapi.h>
@@ -20,8 +20,6 @@
 
 using content::BrowserThread;
 
-namespace options2 {
-
 // Callback that opens the Internet Options control panel dialog with the
 // Connections tab selected.
 void OpenConnectionDialogCallback() {
@@ -68,5 +66,3 @@ void AdvancedOptionsUtilities::ShowManageSSLCertificates(
 #endif
   ::CryptUIDlgCertMgr(&cert_mgr);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/advanced_options_utils2_x11.cc b/chrome/browser/ui/webui/options2/advanced_options_utils_x11.cc
index e505da3..20579b3 100644
--- a/chrome/browser/ui/webui/options2/advanced_options_utils2_x11.cc
+++ b/chrome/browser/ui/webui/options2/advanced_options_utils_x11.cc
@@ -4,7 +4,7 @@
 
 #if !defined(OS_CHROMEOS)
 
-#include "chrome/browser/ui/webui/options2/advanced_options_utils2.h"
+#include "chrome/browser/ui/webui/options2/advanced_options_utils.h"
 
 #include "base/bind.h"
 #include "base/environment.h"
@@ -18,8 +18,6 @@
 
 using content::BrowserThread;
 
-namespace options2 {
-
 // Command used to configure GNOME 2 proxy settings.
 const char* kGNOME2ProxyConfigCommand[] = {"gnome-network-properties", NULL};
 // In GNOME 3, we might need to run gnome-control-center instead. We try this
@@ -139,6 +137,4 @@ void AdvancedOptionsUtilities::ShowNetworkProxySettings(
       base::Bind(&DetectAndStartProxyConfigUtil, tab_contents));
 }
 
-}  // namespace options2
-
 #endif  // !defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/webui/options2/autofill_options2_browsertest.js b/chrome/browser/ui/webui/options2/autofill_options_browsertest.js
index d9a5c9b..d9a5c9b 100644
--- a/chrome/browser/ui/webui/options2/autofill_options2_browsertest.js
+++ b/chrome/browser/ui/webui/options2/autofill_options_browsertest.js
diff --git a/chrome/browser/ui/webui/options2/autofill_options_handler2.cc b/chrome/browser/ui/webui/options2/autofill_options_handler.cc
index ab8b01f..f751e635 100644
--- a/chrome/browser/ui/webui/options2/autofill_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/autofill_options_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/autofill_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/autofill_options_handler.h"
 
 #include <vector>
 
@@ -257,8 +257,6 @@ void ValidatePhoneArguments(const ListValue* args, ListValue** list) {
 
 }  // namespace
 
-namespace options2 {
-
 AutofillOptionsHandler::AutofillOptionsHandler()
     : personal_data_(NULL) {
 }
@@ -614,5 +612,3 @@ void AutofillOptionsHandler::ValidatePhoneNumbers(const ListValue* args) {
   web_ui_->CallJavascriptFunction(
     "AutofillEditAddressOverlay.setValidatedPhoneNumbers", *list_value);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/autofill_options_handler2.h b/chrome/browser/ui/webui/options2/autofill_options_handler.h
index 827f841..4eeb90a 100644
--- a/chrome/browser/ui/webui/options2/autofill_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/autofill_options_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_AUTOFILL_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_AUTOFILL_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_AUTOFILL_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_AUTOFILL_OPTIONS_HANDLER_H_
 
 #include <string>
 
@@ -18,15 +18,13 @@ class DictionaryValue;
 class ListValue;
 }
 
-namespace options2 {
-
-class AutofillOptionsHandler : public OptionsPageUIHandler,
+class AutofillOptionsHandler : public OptionsPage2UIHandler,
                                public PersonalDataManagerObserver {
  public:
   AutofillOptionsHandler();
   virtual ~AutofillOptionsHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void Initialize() OVERRIDE;
@@ -88,6 +86,4 @@ class AutofillOptionsHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(AutofillOptionsHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_AUTOFILL_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_AUTOFILL_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/browser_options2_browsertest.js b/chrome/browser/ui/webui/options2/browser_options_browsertest.js
index e983b27..e983b27 100644
--- a/chrome/browser/ui/webui/options2/browser_options2_browsertest.js
+++ b/chrome/browser/ui/webui/options2/browser_options_browsertest.js
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.cc b/chrome/browser/ui/webui/options2/browser_options_handler.cc
index 7817a77..9efc06e 100644
--- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/browser_options_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/browser_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/browser_options_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ -46,8 +46,6 @@
 using content::BrowserThread;
 using content::UserMetricsAction;
 
-namespace options2 {
-
 BrowserOptionsHandler::BrowserOptionsHandler()
     : template_url_service_(NULL),
       startup_custom_pages_table_model_(NULL),
@@ -567,5 +565,3 @@ void BrowserOptionsHandler::OnResultChanged(bool default_match_changed) {
   web_ui_->CallJavascriptFunction(
       "BrowserOptions.updateAutocompleteSuggestions", suggestions);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.h b/chrome/browser/ui/webui/options2/browser_options_handler.h
index c0a644e..18f1ddb 100644
--- a/chrome/browser/ui/webui/options2/browser_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/browser_options_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_BROWSER_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_BROWSER_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_BROWSER_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_BROWSER_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
@@ -21,10 +21,8 @@ class AutocompleteController;
 class CustomHomePagesTableModel;
 class TemplateURLService;
 
-namespace options2 {
-
 // Chrome browser options page UI handler.
-class BrowserOptionsHandler : public OptionsPageUIHandler,
+class BrowserOptionsHandler : public OptionsPage2UIHandler,
                               public AutocompleteControllerDelegate,
                               public ShellIntegration::DefaultWebClientObserver,
                               public TemplateURLServiceObserver,
@@ -35,7 +33,7 @@ class BrowserOptionsHandler : public OptionsPageUIHandler,
 
   virtual void Initialize() OVERRIDE;
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
   virtual void RegisterMessages() OVERRIDE;
 
@@ -157,6 +155,4 @@ class BrowserOptionsHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(BrowserOptionsHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_BROWSER_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_BROWSER_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/certificate_manager2_browsertest.js b/chrome/browser/ui/webui/options2/certificate_manager_browsertest.js
index fdd2373..fdd2373 100644
--- a/chrome/browser/ui/webui/options2/certificate_manager2_browsertest.js
+++ b/chrome/browser/ui/webui/options2/certificate_manager_browsertest.js
diff --git a/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc b/chrome/browser/ui/webui/options2/certificate_manager_handler.cc
index 694cc2a..00d52f6 100644
--- a/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc
+++ b/chrome/browser/ui/webui/options2/certificate_manager_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/certificate_manager_handler2.h"
+#include "chrome/browser/ui/webui/options2/certificate_manager_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -140,8 +140,6 @@ std::string NetErrorToString(int net_error) {
 
 }  // namespace
 
-namespace options2 {
-
 ///////////////////////////////////////////////////////////////////////////////
 //  FileAccessProvider
 
@@ -1046,5 +1044,3 @@ void CertificateManagerHandler::CheckTpmTokenReady(const ListValue* args) {
 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
   return web_ui_->tab_contents()->view()->GetTopLevelNativeWindow();
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/certificate_manager_handler2.h b/chrome/browser/ui/webui/options2/certificate_manager_handler.h
index d86b298..9844a19 100644
--- a/chrome/browser/ui/webui/options2/certificate_manager_handler2.h
+++ b/chrome/browser/ui/webui/options2/certificate_manager_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CERTIFICATE_MANAGER_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CERTIFICATE_MANAGER_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CERTIFICATE_MANAGER_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CERTIFICATE_MANAGER_HANDLER_H_
 #pragma once
 
 #include <string>
@@ -17,18 +17,16 @@
 #include "net/base/cert_database.h"
 #include "ui/gfx/native_widget_types.h"
 
-namespace options2 {
-
 class FileAccessProvider;
 
-class CertificateManagerHandler : public OptionsPageUIHandler,
+class CertificateManagerHandler : public OptionsPage2UIHandler,
     public CertificateManagerModel::Observer,
     public SelectFileDialog::Listener {
  public:
   CertificateManagerHandler();
   virtual ~CertificateManagerHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void RegisterMessages() OVERRIDE;
@@ -170,6 +168,4 @@ class CertificateManagerHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(CertificateManagerHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CERTIFICATE_MANAGER_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CERTIFICATE_MANAGER_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/about_page_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/about_page_handler.cc
index 86d8eaa..31d960e 100644
--- a/chrome/browser/ui/webui/options2/chromeos/about_page_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/about_page_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/about_page_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/about_page_handler.h"
 
 #include <vector>
 
@@ -60,7 +60,6 @@ std::string StringSubRange(const std::string& text, size_t start,
 }  // namespace
 
 namespace chromeos {
-namespace options2 {
 
 class AboutPageHandler::UpdateObserver
     : public UpdateEngineClient::Observer {
@@ -417,5 +416,4 @@ void AboutPageHandler::UpdateSelectedChannel(UpdateObserver* observer,
   }
 }
 
-}  // namespace options2
-}  // namespace chromeos
+} // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/about_page_handler2.h b/chrome/browser/ui/webui/options2/chromeos/about_page_handler.h
index 6a01802..cfd78b0 100644
--- a/chrome/browser/ui/webui/options2/chromeos/about_page_handler2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/about_page_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CHROMEOS_ABOUT_PAGE_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_ABOUT_PAGE_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_ABOUT_PAGE_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_ABOUT_PAGE_HANDLER_H_
 
 #include <string>
 
@@ -13,16 +13,15 @@
 #include "chrome/browser/chromeos/version_loader.h"
 
 namespace chromeos {
-namespace options2 {
 
 // ChromeOS about page UI handler.
-class AboutPageHandler : public ::options2::OptionsPageUIHandler {
+class AboutPageHandler : public OptionsPage2UIHandler {
 
  public:
   AboutPageHandler();
   virtual ~AboutPageHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void RegisterMessages() OVERRIDE;
@@ -70,7 +69,6 @@ class AboutPageHandler : public ::options2::OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(AboutPageHandler);
 };
 
-}  // namespace options2
-}  // namespace chromeos
+} // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_ABOUT_PAGE_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_ABOUT_PAGE_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/accounts_options_handler.cc
index 434c8a8b..396dcec 100644
--- a/chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/accounts_options_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/accounts_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/accounts_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -37,8 +37,6 @@ bool WhitelistUser(const std::string& username) {
 
 }  // namespace
 
-namespace options2 {
-
 AccountsOptionsHandler::AccountsOptionsHandler() {
 }
 
@@ -131,5 +129,4 @@ void AccountsOptionsHandler::HandleWhitelistExistingUsers(
   }
 }
 
-}  // namespace options2
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.h b/chrome/browser/ui/webui/options2/chromeos/accounts_options_handler.h
index 591784b..f16c5ba 100644
--- a/chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/accounts_options_handler.h
@@ -2,18 +2,17 @@
 // 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_OPTIONS2_CHROMEOS_ACCOUNTS_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_ACCOUNTS_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_ACCOUNTS_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_ACCOUNTS_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 
 namespace chromeos {
-namespace options2 {
 
 // ChromeOS accounts options page handler.
-class AccountsOptionsHandler : public ::options2::OptionsPageUIHandler {
+class AccountsOptionsHandler : public OptionsPage2UIHandler {
  public:
   AccountsOptionsHandler();
   virtual ~AccountsOptionsHandler();
@@ -21,7 +20,7 @@ class AccountsOptionsHandler : public ::options2::OptionsPageUIHandler {
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages() OVERRIDE;
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
 
@@ -36,7 +35,6 @@ class AccountsOptionsHandler : public ::options2::OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(AccountsOptionsHandler);
 };
 
-}  // namespace options2
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_ACCOUNTS_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_ACCOUNTS_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.cc
index 5abef0c..f8f6a28 100644
--- a/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/bluetooth_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ -10,7 +10,7 @@
 #include "base/values.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
-#include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider.h"
 #include "chrome/common/chrome_switches.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -28,7 +28,6 @@ const int kUpdateDevicePasskeyIndex = 2;
 }  // namespace
 
 namespace chromeos {
-namespace options2 {
 
 BluetoothOptionsHandler::BluetoothOptionsHandler() {
 }
@@ -408,5 +407,5 @@ void BluetoothOptionsHandler::GenerateFakeDevice(
   delete device;
 }
 
-}  // namespace options2
 }  // namespace chromeos
+
diff --git a/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.h b/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.h
index 27badb8..f719734 100644
--- a/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER_H_
 #pragma once
 
 #include <string>
@@ -18,17 +18,16 @@ class DictionaryValue;
 }
 
 namespace chromeos {
-namespace options2 {
 
 // Handler for Bluetooth options on the system options page.
-class BluetoothOptionsHandler : public ::options2::OptionsPageUIHandler,
+class BluetoothOptionsHandler : public OptionsPage2UIHandler,
                                 public chromeos::BluetoothManager::Observer,
                                 public chromeos::BluetoothAdapter::Observer {
  public:
   BluetoothOptionsHandler();
   virtual ~BluetoothOptionsHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void Initialize() OVERRIDE;
@@ -134,7 +133,6 @@ class BluetoothOptionsHandler : public ::options2::OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(BluetoothOptionsHandler);
 };
 
-}  // namespace options2
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc
index 0ad7b66c..cddd2c4 100644
--- a/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/change_picture_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -33,7 +33,6 @@
 #include "ui/views/widget/widget.h"
 
 namespace chromeos {
-namespace options2 {
 
 namespace {
 
@@ -330,7 +329,7 @@ void ChangePictureOptionsHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  ::options2::OptionsPageUIHandler::Observe(type, source, details);
+  OptionsPage2UIHandler::Observe(type, source, details);
   if (type == chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED) {
     // User profile image has been updated.
     SendProfileImage(*content::Details<const SkBitmap>(details).ptr(), false);
@@ -345,5 +344,4 @@ gfx::NativeWindow ChangePictureOptionsHandler::GetBrowserWindow() const {
   return browser->window()->GetNativeHandle();
 }
 
-}  // namespace options2
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler2.h b/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.h
index cb5fd8a..8db67f4 100644
--- a/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_
 
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/options/take_photo_dialog.h"
@@ -18,17 +18,16 @@ class ListValue;
 }
 
 namespace chromeos {
-namespace options2 {
 
 // ChromeOS user image options page UI handler.
-class ChangePictureOptionsHandler : public ::options2::OptionsPageUIHandler,
+class ChangePictureOptionsHandler : public OptionsPage2UIHandler,
                                     public SelectFileDialog::Listener,
                                     public TakePhotoDialog::Delegate {
  public:
   ChangePictureOptionsHandler();
   virtual ~ChangePictureOptionsHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
 
@@ -109,7 +108,6 @@ class ChangePictureOptionsHandler : public ::options2::OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(ChangePictureOptionsHandler);
 };
 
-}  // namespace options2
-}  // namespace chromeos
+} // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.cc
index d03c918..91fbc226 100644
--- a/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/core_chromeos_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.h"
 
 #include <string>
 
@@ -17,7 +17,7 @@
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/prefs/pref_set_observer.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/accounts_options_handler.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
@@ -26,7 +26,6 @@
 #include "content/public/browser/user_metrics.h"
 
 namespace chromeos {
-namespace options2 {
 
 namespace {
 
@@ -134,7 +133,7 @@ base::Value* CoreChromeOSOptionsHandler::FetchPref(
           pref_service->FindPreference(prefs::kProxy);
       return CreateValueForPref(pref, controlling_pref);
     }
-    return ::options2::CoreOptionsHandler::FetchPref(pref_name);
+    return ::CoreOptionsHandler::FetchPref(pref_name);
   }
 
   const base::Value* pref_value = CrosSettings::Get()->GetPref(pref_name);
@@ -161,7 +160,7 @@ void CoreChromeOSOptionsHandler::ObservePref(const std::string& pref_name) {
     return;
   }
   if (!CrosSettings::IsCrosSettings(pref_name))
-    return ::options2::CoreOptionsHandler::ObservePref(pref_name);
+    return ::CoreOptionsHandler::ObservePref(pref_name);
   CrosSettings::Get()->AddSettingsObserver(pref_name.c_str(), this);
 }
 
@@ -175,7 +174,7 @@ void CoreChromeOSOptionsHandler::SetPref(const std::string& pref_name,
     return;
   }
   if (!CrosSettings::IsCrosSettings(pref_name))
-    return ::options2::CoreOptionsHandler::SetPref(pref_name, value, metric);
+    return ::CoreOptionsHandler::SetPref(pref_name, value, metric);
   handling_change_ = true;
   CrosSettings::Get()->Set(pref_name, *value);
   handling_change_ = false;
@@ -190,7 +189,7 @@ void CoreChromeOSOptionsHandler::StopObservingPref(const std::string& path) {
   if (CrosSettings::IsCrosSettings(path))
     CrosSettings::Get()->RemoveSettingsObserver(path.c_str(), this);
   else  // Call base class to handle regular preferences.
-    ::options2::CoreOptionsHandler::StopObservingPref(path);
+    ::CoreOptionsHandler::StopObservingPref(path);
 }
 
 void CoreChromeOSOptionsHandler::Observe(
@@ -216,7 +215,7 @@ void CoreChromeOSOptionsHandler::Observe(
       return;
     }
   }
-  ::options2::CoreOptionsHandler::Observe(type, source, details);
+  ::CoreOptionsHandler::Observe(type, source, details);
 }
 
 void CoreChromeOSOptionsHandler::NotifySettingsChanged(
@@ -266,5 +265,4 @@ void CoreChromeOSOptionsHandler::NotifyProxyPrefsChanged() {
   }
 }
 
-}  // namespace options2
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.h b/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.h
index 963fe77..48aa029 100644
--- a/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.h
@@ -2,21 +2,20 @@
 // 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_OPTIONS2_CHROMEOS_CORE_CHROMEOS_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CORE_CHROMEOS_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CORE_CHROMEOS_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CORE_CHROMEOS_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/ui/webui/options2/core_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/core_options_handler.h"
 
 class PrefSetObserver;
 
 namespace chromeos {
-namespace options2 {
 
 // CoreChromeOSOptionsHandler handles ChromeOS settings.
-class CoreChromeOSOptionsHandler : public ::options2::CoreOptionsHandler {
+class CoreChromeOSOptionsHandler : public CoreOptionsHandler {
  public:
   CoreChromeOSOptionsHandler();
   virtual ~CoreChromeOSOptionsHandler();
@@ -49,7 +48,6 @@ class CoreChromeOSOptionsHandler : public ::options2::CoreOptionsHandler {
   base::WeakPtrFactory<CoreChromeOSOptionsHandler> pointer_factory_;
 };
 
-}  // namespace options2
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CORE_CHROMEOS_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CORE_CHROMEOS_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler.cc
index b3bbcc8..29f5c0a 100644
--- a/chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/cros_language_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler.h"
 
 #include <map>
 #include <set>
@@ -28,7 +28,6 @@
 using content::UserMetricsAction;
 
 namespace chromeos {
-namespace options2 {
 
 CrosLanguageOptionsHandler::CrosLanguageOptionsHandler() {
 }
@@ -38,8 +37,7 @@ CrosLanguageOptionsHandler::~CrosLanguageOptionsHandler() {
 
 void CrosLanguageOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
-  ::options2::LanguageOptionsHandlerCommon::GetLocalizedValues(
-      localized_strings);
+  LanguageOptionsHandlerCommon::GetLocalizedValues(localized_strings);
 
   RegisterTitle(localized_strings, "languagePage",
                 IDS_OPTIONS_SETTINGS_LANGUAGES_AND_INPUT_DIALOG_TITLE);
@@ -77,7 +75,7 @@ void CrosLanguageOptionsHandler::GetLocalizedValues(
 }
 
 void CrosLanguageOptionsHandler::RegisterMessages() {
-  ::options2::LanguageOptionsHandlerCommon::RegisterMessages();
+  LanguageOptionsHandlerCommon::RegisterMessages();
 
   web_ui_->RegisterMessageCallback("inputMethodDisable",
       base::Bind(&CrosLanguageOptionsHandler::InputMethodDisableCallback,
@@ -243,5 +241,4 @@ void CrosLanguageOptionsHandler::InputMethodOptionsOpenCallback(
   content::RecordComputedAction(action);
 }
 
-}  // namespace options2
-}  // namespace chromeos
+} // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler2.h b/chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler.h
index 3ed33dc..aa0464b 100644
--- a/chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler.h
@@ -2,21 +2,19 @@
 // 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_OPTIONS2_CHROMEOS_CROS_LANGUAGE_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CROS_LANGUAGE_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CROS_LANGUAGE_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CROS_LANGUAGE_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/input_method/ibus_controller.h"
-#include "chrome/browser/ui/webui/options2/language_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/language_options_handler.h"
 
 namespace chromeos {
-namespace options2 {
 
 // Language options page UI handler for Chrome OS.  For non-Chrome OS,
 // see LanguageOptionsHnadler.
-class CrosLanguageOptionsHandler
-    : public ::options2::LanguageOptionsHandlerCommon {
+class CrosLanguageOptionsHandler : public LanguageOptionsHandlerCommon {
  public:
   CrosLanguageOptionsHandler();
   virtual ~CrosLanguageOptionsHandler();
@@ -70,7 +68,6 @@ class CrosLanguageOptionsHandler
   DISALLOW_COPY_AND_ASSIGN(CrosLanguageOptionsHandler);
 };
 
-}  // namespace options2
-}  // namespace chromeos
+} // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CROS_LANGUAGE_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CROS_LANGUAGE_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui2_uitest.cc b/chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui_uitest.cc
index b5365ee..e001d63 100644
--- a/chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui2_uitest.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui_uitest.cc
@@ -2,7 +2,7 @@
 // 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/options2/options_ui2_uitest.h"
+#include "chrome/browser/ui/webui/options2/options_ui_uitest.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
diff --git a/chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/internet_options_handler.cc
index d4d04e8..6d47870 100644
--- a/chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/internet_options_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/internet_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
@@ -243,8 +243,6 @@ DictionaryValue* NetworkInfoDictionary::BuildDictionary() {
 
 }  // namespace
 
-namespace options2 {
-
 InternetOptionsHandler::InternetOptionsHandler() {
   registrar_.Add(this, chrome::NOTIFICATION_REQUIRE_PIN_SETTING_CHANGE_ENDED,
       content::NotificationService::AllSources());
@@ -758,7 +756,7 @@ void InternetOptionsHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  OptionsPageUIHandler::Observe(type, source, details);
+  OptionsPage2UIHandler::Observe(type, source, details);
   if (type == chrome::NOTIFICATION_REQUIRE_PIN_SETTING_CHANGE_ENDED) {
     base::FundamentalValue require_pin(*content::Details<bool>(details).ptr());
     web_ui_->CallJavascriptFunction(
@@ -1381,5 +1379,3 @@ void InternetOptionsHandler::SetValueDictionary(
     value_dict->SetString("controlledBy", "recommended");
   settings->Set(key, value_dict);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h b/chrome/browser/ui/webui/options2/chromeos/internet_options_handler.h
index 90d71a0..568f097 100644
--- a/chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/internet_options_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
 
 #include <string>
 
@@ -19,11 +19,9 @@ namespace views {
 class WidgetDelegate;
 }
 
-namespace options2 {
-
 // ChromeOS internet options page UI handler.
 class InternetOptionsHandler
-  : public OptionsPageUIHandler,
+  : public OptionsPage2UIHandler,
     public chromeos::NetworkLibrary::NetworkManagerObserver,
     public chromeos::NetworkLibrary::NetworkObserver,
     public chromeos::NetworkLibrary::CellularDataPlanObserver {
@@ -31,7 +29,7 @@ class InternetOptionsHandler
   InternetOptionsHandler();
   virtual ~InternetOptionsHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void Initialize() OVERRIDE;
@@ -147,6 +145,4 @@ class InternetOptionsHandler
   DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/language_chewing_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/language_chewing_handler.cc
index 06a20c5..c3c3096 100644
--- a/chrome/browser/ui/webui/options2/chromeos/language_chewing_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/language_chewing_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/language_chewing_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_chewing_handler.h"
 
 #include <limits>
 
@@ -11,7 +11,7 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/language_preferences.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_options_util2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_options_util.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -20,7 +20,6 @@ const char kI18nPrefix[] = "Chewing_";
 }  // namespace
 
 namespace chromeos {
-namespace options2 {
 
 LanguageChewingHandler::LanguageChewingHandler() {
 }
@@ -101,5 +100,4 @@ void LanguageChewingHandler::GetLocalizedValues(
       CreateMultipleChoiceList(language_prefs::kChewingHsuSelKeyType));
 }
 
-}  // namespace options2
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/language_chewing_handler2.h b/chrome/browser/ui/webui/options2/chromeos/language_chewing_handler.h
index c2c9eff..5a37249 100644
--- a/chrome/browser/ui/webui/options2/chromeos/language_chewing_handler2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/language_chewing_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CHROMEOS_LANGUAGE_CHEWING_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_CHEWING_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_CHEWING_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_CHEWING_HANDLER_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -15,15 +15,14 @@ class DictionaryValue;
 }
 
 namespace chromeos {
-namespace options2 {
 
 // Chewing options page UI handler.
-class LanguageChewingHandler : public ::options2::OptionsPageUIHandler {
+class LanguageChewingHandler : public OptionsPage2UIHandler {
  public:
   LanguageChewingHandler();
   virtual ~LanguageChewingHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
 
@@ -31,7 +30,6 @@ class LanguageChewingHandler : public ::options2::OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(LanguageChewingHandler);
 };
 
-}  // namespace options2
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_CHEWING_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_CHEWING_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/language_customize_modifier_keys_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/language_customize_modifier_keys_handler.cc
index 8ed76f3..d95b2ace 100644
--- a/chrome/browser/ui/webui/options2/chromeos/language_customize_modifier_keys_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/language_customize_modifier_keys_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/language_customize_modifier_keys_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_customize_modifier_keys_handler.h"
 
 #include "base/values.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
@@ -34,7 +34,6 @@ const char* kDataValuesNames[] = {
 }  // namespace
 
 namespace chromeos {
-namespace options2 {
 
 LanguageCustomizeModifierKeysHandler::LanguageCustomizeModifierKeysHandler() {
 }
@@ -77,5 +76,4 @@ void LanguageCustomizeModifierKeysHandler::GetLocalizedValues(
   }
 }
 
-}  // namespace options2
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/language_customize_modifier_keys_handler2.h b/chrome/browser/ui/webui/options2/chromeos/language_customize_modifier_keys_handler.h
index c8aa144..67ea8bd 100644
--- a/chrome/browser/ui/webui/options2/chromeos/language_customize_modifier_keys_handler2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/language_customize_modifier_keys_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CHROMEOS_LANGUAGE_CUSTOMIZE_MODIFIER_KEYS_HANDLER2_H_  // NOLINT
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_CUSTOMIZE_MODIFIER_KEYS_HANDLER2_H_  // NOLINT
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_CUSTOMIZE_MODIFIER_KEYS_HANDLER_H_  // NOLINT
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_CUSTOMIZE_MODIFIER_KEYS_HANDLER_H_  // NOLINT
 #pragma once
 
 #include "base/compiler_specific.h"
@@ -11,23 +11,20 @@
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 
 namespace chromeos {
-namespace options2 {
 
 // Customize modifier keys overlay page UI handler.
-class LanguageCustomizeModifierKeysHandler
-    : public ::options2::OptionsPageUIHandler {
+class LanguageCustomizeModifierKeysHandler : public OptionsPage2UIHandler {
  public:
   LanguageCustomizeModifierKeysHandler();
   virtual ~LanguageCustomizeModifierKeysHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LanguageCustomizeModifierKeysHandler);
 };
 
-}  // namespace options2
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_CUSTOMIZE_MODIFIER_KEYS_HANDLER2_H_  // NOLINT
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_CUSTOMIZE_MODIFIER_KEYS_HANDLER_H_  // NOLINT
diff --git a/chrome/browser/ui/webui/options2/chromeos/language_hangul_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/language_hangul_handler.cc
index 5d7db31..5362ccf 100644
--- a/chrome/browser/ui/webui/options2/chromeos/language_hangul_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/language_hangul_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/language_hangul_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler.h"
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ -11,7 +11,6 @@
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
-namespace options2 {
 
 LanguageHangulHandler::LanguageHangulHandler() {
 }
@@ -45,5 +44,4 @@ ListValue* LanguageHangulHandler::GetKeyboardLayoutList() {
   return keyboard_layout_list;
 }
 
-}  // namespace options2
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/language_hangul_handler2.h b/chrome/browser/ui/webui/options2/chromeos/language_hangul_handler.h
index 607d249..8b1c9de 100644
--- a/chrome/browser/ui/webui/options2/chromeos/language_hangul_handler2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/language_hangul_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CHROMEOS_LANGUAGE_HANGUL_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_HANGUL_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_HANGUL_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_HANGUL_HANDLER_H_
 #pragma once
 
 #include "base/compiler_specific.h"
@@ -15,15 +15,14 @@ class ListValue;
 }
 
 namespace chromeos {
-namespace options2 {
 
 // Hangul options page UI handler.
-class LanguageHangulHandler : public ::options2::OptionsPageUIHandler {
+class LanguageHangulHandler : public OptionsPage2UIHandler {
  public:
   LanguageHangulHandler();
   virtual ~LanguageHangulHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
 
@@ -34,7 +33,6 @@ class LanguageHangulHandler : public ::options2::OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(LanguageHangulHandler);
 };
 
-}  // namespace options2
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_HANGUL_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_HANGUL_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/language_mozc_handler.cc
index 8887d51..ce8afe9 100644
--- a/chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/language_mozc_handler.cc
@@ -2,13 +2,13 @@
 // 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/options2/chromeos/language_mozc_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/language_preferences.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_options_util2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_options_util.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -17,7 +17,6 @@ const char kI18nPrefix[] = "mozc_";
 }  // namespace
 
 namespace chromeos {
-namespace options2 {
 
 LanguageMozcHandler::LanguageMozcHandler() {
 }
@@ -68,5 +67,4 @@ void LanguageMozcHandler::GetLocalizedValues(
   }
 }
 
-}  // namespace options2
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.h b/chrome/browser/ui/webui/options2/chromeos/language_mozc_handler.h
index 589ef27..df1410e 100644
--- a/chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/language_mozc_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CHROMEOS_LANGUAGE_MOZC_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_MOZC_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_MOZC_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_MOZC_HANDLER_H_
 #pragma once
 
 #include "base/compiler_specific.h"
@@ -14,15 +14,14 @@ class DictionaryValue;
 }
 
 namespace chromeos {
-namespace options2 {
 
 // Mozc options page UI handler.
-class LanguageMozcHandler : public ::options2::OptionsPageUIHandler {
+class LanguageMozcHandler : public OptionsPage2UIHandler {
  public:
   LanguageMozcHandler();
   virtual ~LanguageMozcHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
 
@@ -30,7 +29,6 @@ class LanguageMozcHandler : public ::options2::OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(LanguageMozcHandler);
 };
 
-}  // namespace options2
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_MOZC_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_MOZC_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/language_options_util2.cc b/chrome/browser/ui/webui/options2/chromeos/language_options_util.cc
index 46820cd..6108070 100644
--- a/chrome/browser/ui/webui/options2/chromeos/language_options_util2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/language_options_util.cc
@@ -2,10 +2,9 @@
 // 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/options2/chromeos/language_options_util2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_options_util.h"
 
 namespace chromeos {
-namespace options2 {
 
 // See comments in .h.
 Value* CreateValue(const char* in_value) {
@@ -16,5 +15,4 @@ Value* CreateValue(int in_value) {
   return Value::CreateIntegerValue(in_value);
 }
 
-}  // namespace options2
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/language_options_util2.h b/chrome/browser/ui/webui/options2/chromeos/language_options_util.h
index 235d092..70f7307 100644
--- a/chrome/browser/ui/webui/options2/chromeos/language_options_util2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/language_options_util.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CHROMEOS_LANGUAGE_OPTIONS_UTIL2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_OPTIONS_UTIL2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_OPTIONS_UTIL_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_OPTIONS_UTIL_H_
 #pragma once
 
 #include <string>
@@ -18,7 +18,6 @@ class ListValue;
 }
 
 namespace chromeos {
-namespace options2 {
 
 // Returns an i18n-content value corresponding to |preference|.
 template <typename T>
@@ -79,7 +78,6 @@ base::ListValue* CreateMultipleChoiceList(
   return list_value;
 }
 
-}  // namespace options2
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_OPTIONS_UTIL2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_OPTIONS_UTIL_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler.cc
index 4b3c72d9..8e2c19c 100644
--- a/chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler.cc
@@ -2,11 +2,11 @@
 // 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/options2/chromeos/language_pinyin_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler.h"
 
 #include "base/values.h"
 #include "chrome/browser/chromeos/language_preferences.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_options_util2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_options_util.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -15,7 +15,6 @@ const char kI18nPrefix[] = "Pinyin";
 }  // namespace
 
 namespace chromeos {
-namespace options2 {
 
 LanguagePinyinHandler::LanguagePinyinHandler() {
 }
@@ -65,5 +64,4 @@ void LanguagePinyinHandler::GetLocalizedValues(
       list_value);
 }
 
-}  // namespace options2
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler2.h b/chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler.h
index 5071513..7e0d922 100644
--- a/chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CHROMEOS_LANGUAGE_PINYIN_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_PINYIN_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_PINYIN_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_PINYIN_HANDLER_H_
 #pragma once
 
 #include "base/compiler_specific.h"
@@ -14,15 +14,14 @@ class DictionaryValue;
 }
 
 namespace chromeos {
-namespace options2 {
 
 // Pinyin options page UI handler.
-class LanguagePinyinHandler : public ::options2::OptionsPageUIHandler {
+class LanguagePinyinHandler : public OptionsPage2UIHandler {
  public:
   LanguagePinyinHandler();
   virtual ~LanguagePinyinHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
 
@@ -30,7 +29,6 @@ class LanguagePinyinHandler : public ::options2::OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(LanguagePinyinHandler);
 };
 
-}  // namespace options2
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_PINYIN_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_PINYIN_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/proxy_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/proxy_handler.cc
index d3fa638..773fe51 100644
--- a/chrome/browser/ui/webui/options2/chromeos/proxy_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/proxy_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/proxy_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/proxy_handler.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ -18,7 +18,6 @@
 #include "ui/base/resource/resource_bundle.h"
 
 namespace chromeos {
-namespace options2 {
 
 ProxyHandler::ProxyHandler() {
 }
@@ -84,5 +83,4 @@ void ProxyHandler::SetNetworkName(const std::string& name) {
                                   network);
 }
 
-}  // namespace options2
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/proxy_handler2.h b/chrome/browser/ui/webui/options2/chromeos/proxy_handler.h
index ad2f254..d170786 100644
--- a/chrome/browser/ui/webui/options2/chromeos/proxy_handler2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/proxy_handler.h
@@ -2,22 +2,21 @@
 // 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_OPTIONS2_CHROMEOS_PROXY_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_PROXY_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_PROXY_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_PROXY_HANDLER_H_
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 
 namespace chromeos {
-namespace options2 {
 
 // ChromeOS proxy options page UI handler.
-class ProxyHandler : public ::options2::OptionsPageUIHandler {
+class ProxyHandler : public OptionsPage2UIHandler {
  public:
   explicit ProxyHandler();
   virtual ~ProxyHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
 
@@ -29,7 +28,6 @@ class ProxyHandler : public ::options2::OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(ProxyHandler);
 };
 
-}  // namespace options2
-}  // namespace chromeos
+} // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_PROXY_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_PROXY_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/stats_options_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/stats_options_handler.cc
index 838498a..610b01a 100644
--- a/chrome/browser/ui/webui/options2/chromeos/stats_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/stats_options_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/stats_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -13,7 +13,6 @@
 using content::UserMetricsAction;
 
 namespace chromeos {
-namespace options2 {
 
 StatsOptionsHandler::StatsOptionsHandler() {
 }
@@ -45,5 +44,4 @@ void StatsOptionsHandler::HandleMetricsReportingCheckbox(
 #endif
 }
 
-}  // namespace options2
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/stats_options_handler2.h b/chrome/browser/ui/webui/options2/chromeos/stats_options_handler.h
index a2d7ede..2579cb30 100644
--- a/chrome/browser/ui/webui/options2/chromeos/stats_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/stats_options_handler.h
@@ -2,25 +2,24 @@
 // 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_OPTIONS2_CHROMEOS_STATS_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_STATS_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_STATS_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_STATS_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 
 namespace chromeos {
-namespace options2 {
 
 // ChromeOS handler for "Stats/crash reporting to Google" option of the Advanced
 // settings page. This handler does only ChromeOS-specific actions while default
 // code is in Chrome's AdvancedOptionsHandler
 // (chrome/browser/webui/advanced_options_handler.cc).
-class StatsOptionsHandler : public ::options2::OptionsPageUIHandler {
+class StatsOptionsHandler : public OptionsPage2UIHandler {
  public:
   StatsOptionsHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void Initialize() OVERRIDE;
@@ -34,7 +33,6 @@ class StatsOptionsHandler : public ::options2::OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(StatsOptionsHandler);
 };
 
-}  // namespace options2
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_STATS_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_STATS_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/system_options_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/system_options_handler.cc
index 586dd6a..791c903 100644
--- a/chrome/browser/ui/webui/options2/chromeos/system_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/system_options_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/system_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/system_options_handler.h"
 
 #include <string>
 
@@ -25,7 +25,7 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/extensions/extension.h"
@@ -44,10 +44,7 @@ namespace {
 void TouchpadExistsFileThread(bool* exists) {
   *exists = chromeos::system::touchpad_settings::TouchpadExists();
 }
-
-}  // namespace
-
-namespace options2 {
+}
 
 SystemOptionsHandler::SystemOptionsHandler() {
 }
@@ -116,7 +113,7 @@ void SystemOptionsHandler::GetLocalizedValues(
   // TODO(pastarmovj): replace this with a call to the CrosSettings list
   // handling functionality to come.
   localized_strings->Set("timezoneList",
-      static_cast<chromeos::options2::SystemSettingsProvider*>(
+      static_cast<chromeos::SystemSettingsProvider*>(
           chromeos::CrosSettings::Get()->GetProvider(
               chromeos::kSystemTimezone))->GetTimezoneList());
 }
@@ -177,5 +174,3 @@ void SystemOptionsHandler::IncreaseScreenBrightnessCallback(
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       IncreaseScreenBrightness();
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/chromeos/system_options_handler2.h b/chrome/browser/ui/webui/options2/chromeos/system_options_handler.h
index 71b75b0..e3e333b 100644
--- a/chrome/browser/ui/webui/options2/chromeos/system_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/system_options_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CHROMEOS_SYSTEM_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SYSTEM_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SYSTEM_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SYSTEM_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "base/memory/weak_ptr.h"
@@ -14,17 +14,15 @@ namespace base {
 class DictionaryValue;
 }
 
-namespace options2 {
-
 // ChromeOS system options page UI handler.
 class SystemOptionsHandler
-  : public OptionsPageUIHandler,
+  : public OptionsPage2UIHandler,
     public base::SupportsWeakPtr<SystemOptionsHandler> {
  public:
   SystemOptionsHandler();
   virtual ~SystemOptionsHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void Initialize() OVERRIDE;
@@ -49,6 +47,4 @@ class SystemOptionsHandler
   DISALLOW_COPY_AND_ASSIGN(SystemOptionsHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SYSTEM_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SYSTEM_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.cc b/chrome/browser/ui/webui/options2/chromeos/system_settings_provider.cc
index 51ffde6..c951164 100644
--- a/chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/system_settings_provider.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/system_settings_provider2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider.h"
 
 #include <string>
 
@@ -182,7 +182,6 @@ string16 GetExemplarCity(const icu::TimeZone& zone) {
 }  // namespace anonymous
 
 namespace chromeos {
-namespace options2 {
 
 SystemSettingsProvider::SystemSettingsProvider(
     const NotifyObserversCallback& notify_cb)
@@ -331,5 +330,4 @@ string16 SystemSettingsProvider::GetKnownTimezoneID(
   return string16();
 }
 
-}  // namespace options2
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h b/chrome/browser/ui/webui/options2/chromeos/system_settings_provider.h
index f70caa1..33399ed 100644
--- a/chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/system_settings_provider.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CHROMEOS_SYSTEM_SETTINGS_PROVIDER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SYSTEM_SETTINGS_PROVIDER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SYSTEM_SETTINGS_PROVIDER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SYSTEM_SETTINGS_PROVIDER_H_
 
 #include <vector>
 
@@ -20,7 +20,6 @@ class StringValue;
 }
 
 namespace chromeos {
-namespace options2 {
 
 class SystemSettingsProvider : public CrosSettingsProvider,
                                public system::TimezoneSettings::Observer {
@@ -72,7 +71,6 @@ class SystemSettingsProvider : public CrosSettingsProvider,
   DISALLOW_COPY_AND_ASSIGN(SystemSettingsProvider);
 };
 
-}  // namespace options2
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SYSTEM_SETTINGS_PROVIDER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SYSTEM_SETTINGS_PROVIDER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/user_image_source2.cc b/chrome/browser/ui/webui/options2/chromeos/user_image_source.cc
index 3b838ea..f259c03 100644
--- a/chrome/browser/ui/webui/options2/chromeos/user_image_source2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/user_image_source.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/user_image_source2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/user_image_source.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ -12,7 +12,6 @@
 #include "ui/gfx/codec/png_codec.h"
 
 namespace chromeos {
-namespace options2 {
 
 std::vector<unsigned char> UserImageSource::GetUserImage(
     const std::string& email) const {
@@ -51,5 +50,4 @@ std::string UserImageSource::GetMimeType(const std::string&) const {
   return "image/png";
 }
 
-}  // namespace options2
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/user_image_source2.h b/chrome/browser/ui/webui/options2/chromeos/user_image_source.h
index 6bea08e..ea38b49 100644
--- a/chrome/browser/ui/webui/options2/chromeos/user_image_source2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/user_image_source.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CHROMEOS_USER_IMAGE_SOURCE2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_USER_IMAGE_SOURCE2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_USER_IMAGE_SOURCE_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_USER_IMAGE_SOURCE_H_
 #pragma once
 
 #include <string>
@@ -14,7 +14,6 @@
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 
 namespace chromeos {
-namespace options2 {
 
 // UserImageSource is the data source that serves user images for users that
 // have it.
@@ -40,7 +39,6 @@ class UserImageSource : public ChromeURLDataManager::DataSource {
   DISALLOW_COPY_AND_ASSIGN(UserImageSource);
 };
 
-}  // namespace options2
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_USER_IMAGE_SOURCE2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_USER_IMAGE_SOURCE_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler.cc
index ee09a4f..22c0fe6 100644
--- a/chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/virtual_keyboard_manager_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler.h"
 
 #include <map>
 #include <set>
@@ -30,7 +30,6 @@
 namespace ime = ::chromeos::input_method;
 
 namespace chromeos {
-namespace options2 {
 
 VirtualKeyboardManagerHandler::VirtualKeyboardManagerHandler() {
 }
@@ -235,5 +234,4 @@ ListValue* VirtualKeyboardManagerHandler::CreateVirtualKeyboardList(
   return layout_list;
 }
 
-}  // namespace options2
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2.h b/chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler.h
index bf98218..6e720f7 100644
--- a/chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2.h
+++ b/chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CHROMEOS_VIRTUAL_KEYBOARD_MANAGER_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_VIRTUAL_KEYBOARD_MANAGER_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_VIRTUAL_KEYBOARD_MANAGER_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_VIRTUAL_KEYBOARD_MANAGER_HANDLER_H_
 #pragma once
 
 #include <map>
@@ -24,15 +24,13 @@ namespace input_method {
 class VirtualKeyboard;
 }  // namespace input_method;
 
-namespace options2 {
-
 // A class which provides information to virtual_keyboard.js.
-class VirtualKeyboardManagerHandler : public ::options2::OptionsPageUIHandler {
+class VirtualKeyboardManagerHandler : public OptionsPage2UIHandler {
  public:
   VirtualKeyboardManagerHandler();
   virtual ~VirtualKeyboardManagerHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void Initialize() OVERRIDE;
@@ -75,7 +73,6 @@ class VirtualKeyboardManagerHandler : public ::options2::OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardManagerHandler);
 };
 
-}  // namespace options2
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_VIRTUAL_KEYBOARD_MANAGER_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_VIRTUAL_KEYBOARD_MANAGER_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2_unittest.cc b/chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler_unittest.cc
index 8d41ffb..5783401 100644
--- a/chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2_unittest.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler_unittest.cc
@@ -2,7 +2,7 @@
 // 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/options2/chromeos/virtual_keyboard_manager_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler.h"
 
 #include <map>
 #include <set>
@@ -28,7 +28,6 @@ std::set<std::string> CreateLayoutSet(const char* (&layouts)[L]) {
 }  // namespace
 
 namespace chromeos {
-namespace options2 {
 
 class Testee : public VirtualKeyboardManagerHandler {
  public:
@@ -548,5 +547,4 @@ TEST(VirtualKeyboardManagerHandler, TestMultipleKeyboards) {
   EXPECT_EQ("name 3", string_value);
 }
 
-}  // namespace options2
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/clear_browser_data_handler2.cc b/chrome/browser/ui/webui/options2/clear_browser_data_handler.cc
index 5fb263c..a861780 100644
--- a/chrome/browser/ui/webui/options2/clear_browser_data_handler2.cc
+++ b/chrome/browser/ui/webui/options2/clear_browser_data_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/clear_browser_data_handler2.h"
+#include "chrome/browser/ui/webui/options2/clear_browser_data_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ -19,8 +19,6 @@
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace options2 {
-
 ClearBrowserDataHandler::ClearBrowserDataHandler() : remover_(NULL) {
 }
 
@@ -143,5 +141,3 @@ void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() {
   DCHECK(web_ui_);
   web_ui_->CallJavascriptFunction("ClearBrowserDataOverlay.doneClearing");
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/clear_browser_data_handler2.h b/chrome/browser/ui/webui/options2/clear_browser_data_handler.h
index 8680059..0823158 100644
--- a/chrome/browser/ui/webui/options2/clear_browser_data_handler2.h
+++ b/chrome/browser/ui/webui/options2/clear_browser_data_handler.h
@@ -2,24 +2,22 @@
 // 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_OPTIONS2_CLEAR_BROWSER_DATA_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CLEAR_BROWSER_DATA_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CLEAR_BROWSER_DATA_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CLEAR_BROWSER_DATA_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 
-namespace options2 {
-
 // Clear browser data handler page UI handler.
-class ClearBrowserDataHandler : public OptionsPageUIHandler,
+class ClearBrowserDataHandler : public OptionsPage2UIHandler,
                                 public BrowsingDataRemover::Observer {
  public:
   ClearBrowserDataHandler();
   virtual ~ClearBrowserDataHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void Initialize() OVERRIDE;
 
   virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
@@ -44,6 +42,4 @@ class ClearBrowserDataHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(ClearBrowserDataHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CLEAR_BROWSER_DATA_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CLEAR_BROWSER_DATA_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/content_options2_browsertest.js b/chrome/browser/ui/webui/options2/content_options_browsertest.js
index 605660a..605660a 100644
--- a/chrome/browser/ui/webui/options2/content_options2_browsertest.js
+++ b/chrome/browser/ui/webui/options2/content_options_browsertest.js
diff --git a/chrome/browser/ui/webui/options2/content_settings_exception_area2_browsertest.js b/chrome/browser/ui/webui/options2/content_settings_exception_area_browsertest.js
index 33b3fd2..33b3fd2 100644
--- a/chrome/browser/ui/webui/options2/content_settings_exception_area2_browsertest.js
+++ b/chrome/browser/ui/webui/options2/content_settings_exception_area_browsertest.js
diff --git a/chrome/browser/ui/webui/options2/content_settings_handler2.cc b/chrome/browser/ui/webui/options2/content_settings_handler.cc
index 24c910e..67fb223 100644
--- a/chrome/browser/ui/webui/options2/content_settings_handler2.cc
+++ b/chrome/browser/ui/webui/options2/content_settings_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/content_settings_handler2.h"
+#include "chrome/browser/ui/webui/options2/content_settings_handler.h"
 
 #include <map>
 #include <string>
@@ -188,8 +188,6 @@ DictionaryValue* GetNotificationExceptionForPage(
 
 }  // namespace
 
-namespace options2 {
-
 ContentSettingsHandler::ContentSettingsHandler() {
 }
 
@@ -373,7 +371,7 @@ void ContentSettingsHandler::Observe(
     }
 
     default:
-      OptionsPageUIHandler::Observe(type, source, details);
+      OptionsPage2UIHandler::Observe(type, source, details);
   }
 }
 
@@ -879,5 +877,3 @@ HostContentSettingsMap*
     return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap();
   return NULL;
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/content_settings_handler2.h b/chrome/browser/ui/webui/options2/content_settings_handler.h
index c08fc40..665a3ef 100644
--- a/chrome/browser/ui/webui/options2/content_settings_handler2.h
+++ b/chrome/browser/ui/webui/options2/content_settings_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CONTENT_SETTINGS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/plugin_data_remover_helper.h"
@@ -16,14 +16,12 @@
 class HostContentSettingsMap;
 class ProtocolHandlerRegistry;
 
-namespace options2 {
-
-class ContentSettingsHandler : public OptionsPageUIHandler {
+class ContentSettingsHandler : public OptionsPage2UIHandler {
  public:
   ContentSettingsHandler();
   virtual ~ContentSettingsHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
 
   virtual void Initialize() OVERRIDE;
@@ -112,6 +110,4 @@ class ContentSettingsHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/cookies_view2_browsertest.js b/chrome/browser/ui/webui/options2/cookies_view_browsertest.js
index 43213cb..43213cb 100644
--- a/chrome/browser/ui/webui/options2/cookies_view2_browsertest.js
+++ b/chrome/browser/ui/webui/options2/cookies_view_browsertest.js
diff --git a/chrome/browser/ui/webui/options2/cookies_view_handler2.cc b/chrome/browser/ui/webui/options2/cookies_view_handler.cc
index 8375ed4..6d86eb2 100644
--- a/chrome/browser/ui/webui/options2/cookies_view_handler2.cc
+++ b/chrome/browser/ui/webui/options2/cookies_view_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/cookies_view_handler2.h"
+#include "chrome/browser/ui/webui/options2/cookies_view_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -20,8 +20,6 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace options2 {
-
 CookiesViewHandler::CookiesViewHandler() : batch_update_(false) {
 }
 
@@ -222,5 +220,3 @@ void CookiesViewHandler::SendChildren(CookieTreeNode* parent) {
 
   web_ui_->CallJavascriptFunction("CookiesView.loadChildren", args);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/cookies_view_handler2.h b/chrome/browser/ui/webui/options2/cookies_view_handler.h
index 19e4110..5167cf6 100644
--- a/chrome/browser/ui/webui/options2/cookies_view_handler2.h
+++ b/chrome/browser/ui/webui/options2/cookies_view_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_COOKIES_VIEW_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_COOKIES_VIEW_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_COOKIES_VIEW_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_COOKIES_VIEW_HANDLER_H_
 #pragma once
 
 #include "base/compiler_specific.h"
@@ -11,15 +11,13 @@
 #include "chrome/browser/cookies_tree_model.h"
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 
-namespace options2 {
-
-class CookiesViewHandler : public OptionsPageUIHandler,
+class CookiesViewHandler : public OptionsPage2UIHandler,
                            public CookiesTreeModel::Observer {
  public:
   CookiesViewHandler();
   virtual ~CookiesViewHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void RegisterMessages() OVERRIDE;
@@ -68,6 +66,4 @@ class CookiesViewHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(CookiesViewHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_COOKIES_VIEW_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_COOKIES_VIEW_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/core_options_handler2.cc b/chrome/browser/ui/webui/options2/core_options_handler.cc
index ee149cf..4140233 100644
--- a/chrome/browser/ui/webui/options2/core_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/core_options_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/core_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/core_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -31,8 +31,6 @@
 
 using content::UserMetricsAction;
 
-namespace options2 {
-
 CoreOptionsHandler::CoreOptionsHandler()
     : handlers_host_(NULL) {
 }
@@ -466,5 +464,3 @@ void CoreOptionsHandler::UpdateClearPluginLSOData() {
   web_ui_->CallJavascriptFunction(
       "OptionsPage.setClearPluginLSODataEnabled", *enabled);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/core_options_handler2.h b/chrome/browser/ui/webui/options2/core_options_handler.h
index 4f0fb97..e1adb21 100644
--- a/chrome/browser/ui/webui/options2/core_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/core_options_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_CORE_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CORE_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CORE_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CORE_OPTIONS_HANDLER_H_
 #pragma once
 
 #include <map>
@@ -15,16 +15,14 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 
-namespace options2 {
-
 // Core options UI handler.
 // Handles resource and JS calls common to all options sub-pages.
-class CoreOptionsHandler : public OptionsPageUIHandler {
+class CoreOptionsHandler : public OptionsPage2UIHandler {
  public:
   CoreOptionsHandler();
   virtual ~CoreOptionsHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void Initialize() OVERRIDE;
   virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
   virtual void Uninitialize() OVERRIDE;
@@ -38,7 +36,7 @@ class CoreOptionsHandler : public OptionsPageUIHandler {
   virtual void RegisterMessages() OVERRIDE;
   virtual WebUIMessageHandler* Attach(WebUI* web_ui) OVERRIDE;
 
-  void set_handlers_host(OptionsPageUIHandlerHost* handlers_host) {
+  void set_handlers_host(OptionsPage2UIHandlerHost* handlers_host) {
     handlers_host_ = handlers_host;
   }
 
@@ -140,7 +138,7 @@ class CoreOptionsHandler : public OptionsPageUIHandler {
 
   void UpdateClearPluginLSOData();
 
-  OptionsPageUIHandlerHost* handlers_host_;
+  OptionsPage2UIHandlerHost* handlers_host_;
   PrefChangeRegistrar registrar_;
 
   // Used for asynchronously updating the preference stating whether clearing
@@ -150,6 +148,4 @@ class CoreOptionsHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(CoreOptionsHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CORE_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CORE_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/font_settings2_browsertest.js b/chrome/browser/ui/webui/options2/font_settings_browsertest.js
index 9800b41..9800b41 100644
--- a/chrome/browser/ui/webui/options2/font_settings2_browsertest.js
+++ b/chrome/browser/ui/webui/options2/font_settings_browsertest.js
diff --git a/chrome/browser/ui/webui/options2/font_settings_handler2.cc b/chrome/browser/ui/webui/options2/font_settings_handler.cc
index 8122a63..2ffef10b 100644
--- a/chrome/browser/ui/webui/options2/font_settings_handler2.cc
+++ b/chrome/browser/ui/webui/options2/font_settings_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/font_settings_handler2.h"
+#include "chrome/browser/ui/webui/options2/font_settings_handler.h"
 
 #include <string>
 
@@ -17,7 +17,7 @@
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/options2/font_settings_utils2.h"
+#include "chrome/browser/ui/webui/options2/font_settings_utils.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
@@ -25,8 +25,6 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace options2 {
-
 FontSettingsHandler::FontSettingsHandler() {
 }
 
@@ -77,7 +75,7 @@ void FontSettingsHandler::Initialize() {
 
 WebUIMessageHandler* FontSettingsHandler::Attach(WebUI* web_ui) {
   // Call through to superclass.
-  WebUIMessageHandler* handler = OptionsPageUIHandler::Attach(web_ui);
+  WebUIMessageHandler* handler = OptionsPage2UIHandler::Attach(web_ui);
 
   // Perform validation for saved fonts.
   DCHECK(web_ui_);
@@ -211,5 +209,3 @@ void FontSettingsHandler::SetUpMinimumFontSample() {
   web_ui_->CallJavascriptFunction("FontSettings.setUpMinimumFontSample",
                                   size_value);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/font_settings_handler2.h b/chrome/browser/ui/webui/options2/font_settings_handler.h
index e93ab58..baedd3b 100644
--- a/chrome/browser/ui/webui/options2/font_settings_handler2.h
+++ b/chrome/browser/ui/webui/options2/font_settings_handler.h
@@ -2,23 +2,21 @@
 // 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_OPTIONS2_FONT_SETTINGS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_FONT_SETTINGS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_FONT_SETTINGS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_FONT_SETTINGS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 #include "content/browser/font_list_async.h"
 
-namespace options2 {
-
 // Font settings overlay page UI handler.
-class FontSettingsHandler : public OptionsPageUIHandler {
+class FontSettingsHandler : public OptionsPage2UIHandler {
  public:
   FontSettingsHandler();
   virtual ~FontSettingsHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
   virtual void Initialize() OVERRIDE;
 
@@ -54,6 +52,4 @@ class FontSettingsHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(FontSettingsHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_FONT_SETTINGS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_FONT_SETTINGS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/font_settings_utils2.h b/chrome/browser/ui/webui/options2/font_settings_utils.h
index 12b661b..9fb435c 100644
--- a/chrome/browser/ui/webui/options2/font_settings_utils2.h
+++ b/chrome/browser/ui/webui/options2/font_settings_utils.h
@@ -2,16 +2,14 @@
 // 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_OPTIONS2_FONT_SETTINGS_UTILS2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_FONT_SETTINGS_UTILS2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_FONT_SETTINGS_UTILS_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_FONT_SETTINGS_UTILS_H_
 #pragma once
 
 #include "base/basictypes.h"
 
 class PrefService;
 
-namespace options2 {
-
 // Chrome advanced options utility methods.
 class FontSettingsUtilities {
  public:
@@ -21,6 +19,4 @@ class FontSettingsUtilities {
   DISALLOW_IMPLICIT_CONSTRUCTORS(FontSettingsUtilities);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_FONT_SETTINGS_UTILS2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_FONT_SETTINGS_UTILS_H_
diff --git a/chrome/browser/ui/webui/options2/font_settings_utils2_mac.mm b/chrome/browser/ui/webui/options2/font_settings_utils_mac.mm
index aa7beeb..0d26d83 100644
--- a/chrome/browser/ui/webui/options2/font_settings_utils2_mac.mm
+++ b/chrome/browser/ui/webui/options2/font_settings_utils_mac.mm
@@ -2,7 +2,7 @@
 // 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/options2/font_settings_utils2.h"
+#include "chrome/browser/ui/webui/options2/font_settings_utils.h"
 
 #import <Cocoa/Cocoa.h>
 
@@ -12,8 +12,6 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
 
-namespace options2 {
-
 static void ValidateFontFamily(PrefService* prefs,
                                const char* family_pref_name) {
   // The native font settings dialog saved fonts by the font name, rather
@@ -38,5 +36,3 @@ void FontSettingsUtilities::ValidateSavedFonts(PrefService* prefs) {
   ValidateFontFamily(prefs, prefs::kWebKitSansSerifFontFamily);
   ValidateFontFamily(prefs, prefs::kWebKitFixedFontFamily);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/font_settings_utils2_win.cc b/chrome/browser/ui/webui/options2/font_settings_utils_win.cc
index 5bff7f8..3c5ff5e 100644
--- a/chrome/browser/ui/webui/options2/font_settings_utils2_win.cc
+++ b/chrome/browser/ui/webui/options2/font_settings_utils_win.cc
@@ -2,13 +2,10 @@
 // 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/options2/font_settings_utils2.h"
-
-namespace options2 {
+#include "chrome/browser/ui/webui/options2/font_settings_utils.h"
 
 // static
 void FontSettingsUtilities::ValidateSavedFonts(PrefService* prefs) {
   // Nothing to do for Windows.
 }
 
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/font_settings_utils2_x11.cc b/chrome/browser/ui/webui/options2/font_settings_utils_x11.cc
index 2e6a4e0..61c2c6e 100644
--- a/chrome/browser/ui/webui/options2/font_settings_utils2_x11.cc
+++ b/chrome/browser/ui/webui/options2/font_settings_utils_x11.cc
@@ -2,13 +2,9 @@
 // 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/options2/font_settings_utils2.h"
-
-namespace options2 {
+#include "chrome/browser/ui/webui/options2/font_settings_utils.h"
 
 // static
 void FontSettingsUtilities::ValidateSavedFonts(PrefService* prefs) {
   // Nothing to do for X11.
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/handler_options_handler2.cc b/chrome/browser/ui/webui/options2/handler_options_handler.cc
index 141e840..4c4c30f 100644
--- a/chrome/browser/ui/webui/options2/handler_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/handler_options_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/handler_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/handler_options_handler.h"
 
 #include <vector>
 
@@ -16,7 +16,6 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace options2 {
 
 HandlerOptionsHandler::HandlerOptionsHandler() {
 }
@@ -206,5 +205,3 @@ void HandlerOptionsHandler::Observe(
   else
     NOTREACHED();
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/handler_options_handler2.h b/chrome/browser/ui/webui/options2/handler_options_handler.h
index ea60f43..4699f82 100644
--- a/chrome/browser/ui/webui/options2/handler_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/handler_options_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_HANDLER_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_HANDLER_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_HANDLER_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_HANDLER_OPTIONS_HANDLER_H_
 
 #include <string>
 
@@ -16,14 +16,12 @@ namespace base {
 class DictionaryValue;
 }
 
-namespace options2 {
-
-class HandlerOptionsHandler : public OptionsPageUIHandler {
+class HandlerOptionsHandler : public OptionsPage2UIHandler {
  public:
   HandlerOptionsHandler();
   virtual ~HandlerOptionsHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void Initialize() OVERRIDE;
@@ -75,6 +73,4 @@ class HandlerOptionsHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(HandlerOptionsHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_HANDLER_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_HANDLER_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/import_data_handler2.cc b/chrome/browser/ui/webui/options2/import_data_handler.cc
index 5e5b22b..76e5b83 100644
--- a/chrome/browser/ui/webui/options2/import_data_handler2.cc
+++ b/chrome/browser/ui/webui/options2/import_data_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/import_data_handler2.h"
+#include "chrome/browser/ui/webui/options2/import_data_handler.h"
 
 #include <string>
 
@@ -24,8 +24,6 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace options2 {
-
 ImportDataHandler::ImportDataHandler() : importer_host_(NULL),
                                          import_did_succeed_(false) {
 }
@@ -177,5 +175,3 @@ void ImportDataHandler::ImportEnded() {
     web_ui_->CallJavascriptFunction("ImportDataOverlay.dismiss");
   }
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/import_data_handler2.h b/chrome/browser/ui/webui/options2/import_data_handler.h
index 712dd5f..f537c54 100644
--- a/chrome/browser/ui/webui/options2/import_data_handler2.h
+++ b/chrome/browser/ui/webui/options2/import_data_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_IMPORT_DATA_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_IMPORT_DATA_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_IMPORT_DATA_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_IMPORT_DATA_HANDLER_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -17,17 +17,15 @@
 class ImporterHost;
 class ImporterList;
 
-namespace options2 {
-
 // Chrome personal stuff import data overlay UI handler.
-class ImportDataHandler : public OptionsPageUIHandler,
+class ImportDataHandler : public OptionsPage2UIHandler,
                           public importer::ImporterListObserver,
                           public importer::ImporterProgressObserver {
  public:
   ImportDataHandler();
   virtual ~ImportDataHandler();
 
-  // OptionsPageUIHandler:
+  // OptionsPage2UIHandler:
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void Initialize() OVERRIDE;
@@ -58,6 +56,4 @@ class ImportDataHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(ImportDataHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_IMPORT_DATA_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_IMPORT_DATA_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/language_options2_browsertest.js b/chrome/browser/ui/webui/options2/language_options_browsertest.js
index 4f1b87c..4f1b87c 100644
--- a/chrome/browser/ui/webui/options2/language_options2_browsertest.js
+++ b/chrome/browser/ui/webui/options2/language_options_browsertest.js
diff --git a/chrome/browser/ui/webui/options2/language_options_handler2.cc b/chrome/browser/ui/webui/options2/language_options_handler.cc
index 8269191..64e4d8c 100644
--- a/chrome/browser/ui/webui/options2/language_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/language_options_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/language_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/language_options_handler.h"
 
 #include <map>
 #include <string>
@@ -27,8 +27,6 @@
 
 using content::UserMetricsAction;
 
-namespace options2 {
-
 LanguageOptionsHandler::LanguageOptionsHandler() {
 }
 
@@ -118,5 +116,3 @@ void LanguageOptionsHandler::RestartCallback(const ListValue* args) {
   content::RecordAction(UserMetricsAction("LanguageOptions_Restart"));
   BrowserList::AttemptRestart();
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/language_options_handler2.h b/chrome/browser/ui/webui/options2/language_options_handler.h
index 1e76a34..1131b32 100644
--- a/chrome/browser/ui/webui/options2/language_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/language_options_handler.h
@@ -2,13 +2,11 @@
 // 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_OPTIONS2_LANGUAGE_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_LANGUAGE_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_LANGUAGE_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_LANGUAGE_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/ui/webui/options2/language_options_handler_common2.h"
-
-namespace options2 {
+#include "chrome/browser/ui/webui/options2/language_options_handler_common.h"
 
 // Language options UI page handler for non-Chrome OS platforms.  For Chrome OS,
 // see chromeos::CrosLanguageOptionsHandler.
@@ -43,6 +41,4 @@ class LanguageOptionsHandler : public LanguageOptionsHandlerCommon {
   DISALLOW_COPY_AND_ASSIGN(LanguageOptionsHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_LANGUAGE_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_LANGUAGE_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/language_options_handler_common2.cc b/chrome/browser/ui/webui/options2/language_options_handler_common.cc
index 341b1a9..cff8ee7 100644
--- a/chrome/browser/ui/webui/options2/language_options_handler_common2.cc
+++ b/chrome/browser/ui/webui/options2/language_options_handler_common.cc
@@ -2,7 +2,7 @@
 // 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/options2/language_options_handler_common2.h"
+#include "chrome/browser/ui/webui/options2/language_options_handler_common.h"
 
 #include <map>
 #include <string>
@@ -28,8 +28,6 @@
 
 using content::UserMetricsAction;
 
-namespace options2 {
-
 LanguageOptionsHandlerCommon::LanguageOptionsHandlerCommon() {
 }
 
@@ -168,5 +166,3 @@ void LanguageOptionsHandlerCommon::SpellCheckLanguageChangeCallback(
       "LanguageOptions_SpellCheckLanguageChange_%s", language_code.c_str());
   content::RecordComputedAction(action);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/language_options_handler_common2.h b/chrome/browser/ui/webui/options2/language_options_handler_common.h
index 4eae484..562a722 100644
--- a/chrome/browser/ui/webui/options2/language_options_handler_common2.h
+++ b/chrome/browser/ui/webui/options2/language_options_handler_common.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_LANGUAGE_OPTIONS_HANDLER_COMMON2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_LANGUAGE_OPTIONS_HANDLER_COMMON2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_LANGUAGE_OPTIONS_HANDLER_COMMON_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_LANGUAGE_OPTIONS_HANDLER_COMMON_H_
 #pragma once
 
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
@@ -13,16 +13,14 @@ class DictionaryValue;
 class ListValue;
 }
 
-namespace options2 {
-
 // The base class for language options page UI handlers.  This class has code
 // common to the Chrome OS and non-Chrome OS implementation of the handler.
-class LanguageOptionsHandlerCommon : public OptionsPageUIHandler {
+class LanguageOptionsHandlerCommon : public OptionsPage2UIHandler {
  public:
   LanguageOptionsHandlerCommon();
   virtual ~LanguageOptionsHandlerCommon();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
 
@@ -68,6 +66,4 @@ class LanguageOptionsHandlerCommon : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(LanguageOptionsHandlerCommon);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_LANGUAGE_OPTIONS_HANDLER_COMMON2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_LANGUAGE_OPTIONS_HANDLER_COMMON_H_
diff --git a/chrome/browser/ui/webui/options2/language_options_handler2_unittest.cc b/chrome/browser/ui/webui/options2/language_options_handler_unittest.cc
index 083e020..c889818 100644
--- a/chrome/browser/ui/webui/options2/language_options_handler2_unittest.cc
+++ b/chrome/browser/ui/webui/options2/language_options_handler_unittest.cc
@@ -2,7 +2,7 @@
 // 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/options2/language_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/language_options_handler.h"
 
 #include <string>
 
@@ -13,7 +13,7 @@
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/input_method/ibus_controller.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
-#include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler.h"
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/webui/options2/manage_profile_handler2.cc b/chrome/browser/ui/webui/options2/manage_profile_handler.cc
index ada5fb9..4c29788 100644
--- a/chrome/browser/ui/webui/options2/manage_profile_handler2.cc
+++ b/chrome/browser/ui/webui/options2/manage_profile_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/manage_profile_handler2.h"
+#include "chrome/browser/ui/webui/options2/manage_profile_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -22,8 +22,6 @@
 #include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 
-namespace options2 {
-
 ManageProfileHandler::ManageProfileHandler() {
 }
 
@@ -80,7 +78,7 @@ void ManageProfileHandler::Observe(
     SendProfileNames();
     SendProfileIcons();
   } else {
-    OptionsPageUIHandler::Observe(type, source, details);
+    OptionsPage2UIHandler::Observe(type, source, details);
   }
 }
 
@@ -300,5 +298,3 @@ void ManageProfileHandler::ProfileIconSelectionChanged(
   web_ui_->CallJavascriptFunction("ManageProfileOverlay.setProfileName",
                                   gaia_name_value);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/manage_profile_handler2.h b/chrome/browser/ui/webui/options2/manage_profile_handler.h
index 2790b3e..8e79f6a 100644
--- a/chrome/browser/ui/webui/options2/manage_profile_handler2.h
+++ b/chrome/browser/ui/webui/options2/manage_profile_handler.h
@@ -2,21 +2,19 @@
 // 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_OPTIONS2_MANAGE_PROFILE_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_MANAGE_PROFILE_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_MANAGE_PROFILE_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_MANAGE_PROFILE_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 
-namespace options2 {
-
 // Chrome personal stuff profiles manage overlay UI handler.
-class ManageProfileHandler : public OptionsPageUIHandler {
+class ManageProfileHandler : public OptionsPage2UIHandler {
  public:
   ManageProfileHandler();
   virtual ~ManageProfileHandler();
 
-  // OptionsPageUIHandler:
+  // OptionsPage2UIHandler:
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void Initialize() OVERRIDE;
@@ -81,6 +79,4 @@ class ManageProfileHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(ManageProfileHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_MANAGE_PROFILE_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_MANAGE_PROFILE_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/options2_browsertest.js b/chrome/browser/ui/webui/options2/options_browsertest.js
index 9be9041..9be9041 100644
--- a/chrome/browser/ui/webui/options2/options2_browsertest.js
+++ b/chrome/browser/ui/webui/options2/options_browsertest.js
diff --git a/chrome/browser/ui/webui/options2/options_sync_setup_handler2.cc b/chrome/browser/ui/webui/options2/options_sync_setup_handler.cc
index 9e622dc..81e114e 100644
--- a/chrome/browser/ui/webui/options2/options_sync_setup_handler2.cc
+++ b/chrome/browser/ui/webui/options2/options_sync_setup_handler.cc
@@ -2,13 +2,11 @@
 // 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/options2/options_sync_setup_handler2.h"
+#include "chrome/browser/ui/webui/options2/options_sync_setup_handler.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 
-namespace options2 {
-
 OptionsSyncSetupHandler::OptionsSyncSetupHandler(
     ProfileManager* profile_manager) : SyncSetupHandler2(profile_manager) {
 }
@@ -55,5 +53,3 @@ void OptionsSyncSetupHandler::ShowSetupUI() {
   scoped_ptr<Value> page(Value::CreateStringValue("syncSetup"));
   web_ui_->CallJavascriptFunction("OptionsPage.navigateToPage", *page);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/options_sync_setup_handler2.h b/chrome/browser/ui/webui/options2/options_sync_setup_handler.h
index 25631c1..a61df17 100644
--- a/chrome/browser/ui/webui/options2/options_sync_setup_handler2.h
+++ b/chrome/browser/ui/webui/options2/options_sync_setup_handler.h
@@ -2,13 +2,11 @@
 // 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_OPTIONS2_OPTIONS_SYNC_SETUP_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_SYNC_SETUP_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_SYNC_SETUP_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_SYNC_SETUP_HANDLER_H_
 
 #include "chrome/browser/ui/webui/sync_setup_handler2.h"
 
-namespace options2 {
-
 // The handler for Javascript messages related to sync setup UI in the options
 // page.
 class OptionsSyncSetupHandler : public SyncSetupHandler2 {
@@ -21,6 +19,4 @@ class OptionsSyncSetupHandler : public SyncSetupHandler2 {
   virtual void ShowSetupUI() OVERRIDE;
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_SYNC_SETUP_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_SYNC_SETUP_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/options_ui2.cc b/chrome/browser/ui/webui/options2/options_ui2.cc
index 4804648..c30742c 100644
--- a/chrome/browser/ui/webui/options2/options_ui2.cc
+++ b/chrome/browser/ui/webui/options2/options_ui2.cc
@@ -19,24 +19,24 @@
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/options2/advanced_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/autofill_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/browser_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/clear_browser_data_handler2.h"
-#include "chrome/browser/ui/webui/options2/content_settings_handler2.h"
-#include "chrome/browser/ui/webui/options2/cookies_view_handler2.h"
-#include "chrome/browser/ui/webui/options2/core_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/font_settings_handler2.h"
-#include "chrome/browser/ui/webui/options2/handler_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/import_data_handler2.h"
-#include "chrome/browser/ui/webui/options2/language_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/manage_profile_handler2.h"
-#include "chrome/browser/ui/webui/options2/options_sync_setup_handler2.h"
-#include "chrome/browser/ui/webui/options2/password_manager_handler2.h"
-#include "chrome/browser/ui/webui/options2/personal_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/search_engine_manager_handler2.h"
-#include "chrome/browser/ui/webui/options2/stop_syncing_handler2.h"
-#include "chrome/browser/ui/webui/options2/web_intents_settings_handler2.h"
+#include "chrome/browser/ui/webui/options2/advanced_options_handler.h"
+#include "chrome/browser/ui/webui/options2/autofill_options_handler.h"
+#include "chrome/browser/ui/webui/options2/browser_options_handler.h"
+#include "chrome/browser/ui/webui/options2/clear_browser_data_handler.h"
+#include "chrome/browser/ui/webui/options2/content_settings_handler.h"
+#include "chrome/browser/ui/webui/options2/cookies_view_handler.h"
+#include "chrome/browser/ui/webui/options2/core_options_handler.h"
+#include "chrome/browser/ui/webui/options2/font_settings_handler.h"
+#include "chrome/browser/ui/webui/options2/handler_options_handler.h"
+#include "chrome/browser/ui/webui/options2/import_data_handler.h"
+#include "chrome/browser/ui/webui/options2/language_options_handler.h"
+#include "chrome/browser/ui/webui/options2/manage_profile_handler.h"
+#include "chrome/browser/ui/webui/options2/options_sync_setup_handler.h"
+#include "chrome/browser/ui/webui/options2/password_manager_handler.h"
+#include "chrome/browser/ui/webui/options2/personal_options_handler.h"
+#include "chrome/browser/ui/webui/options2/search_engine_manager_handler.h"
+#include "chrome/browser/ui/webui/options2/stop_syncing_handler.h"
+#include "chrome/browser/ui/webui/options2/web_intents_settings_handler.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/time_format.h"
@@ -56,45 +56,43 @@
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/ui/webui/options2/chromeos/about_page_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_chewing_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_customize_modifier_keys_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/proxy_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/system_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/user_image_source2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/about_page_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/accounts_options_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_chewing_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_customize_modifier_keys_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/proxy_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/system_options_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/user_image_source.h"
+#include "chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler.h"
 #endif
 
 #if defined(USE_NSS)
-#include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h"
+#include "chrome/browser/ui/webui/options2/certificate_manager_handler.h"
 #endif
 
-namespace options2 {
-
 static const char kLocalizedStringsFile[] = "strings.js";
 static const char kOptionsBundleJsFile[]  = "options_bundle.js";
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// OptionsUIHTMLSource
+// Options2UIHTMLSource
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-class OptionsUIHTMLSource : public ChromeURLDataManager::DataSource {
+class Options2UIHTMLSource : public ChromeURLDataManager::DataSource {
  public:
   // The constructor takes over ownership of |localized_strings|.
-  explicit OptionsUIHTMLSource(DictionaryValue* localized_strings);
-  virtual ~OptionsUIHTMLSource();
+  explicit Options2UIHTMLSource(DictionaryValue* localized_strings);
+  virtual ~Options2UIHTMLSource();
 
   // Called when the network layer has requested a resource underneath
   // the path we registered.
@@ -107,18 +105,18 @@ class OptionsUIHTMLSource : public ChromeURLDataManager::DataSource {
    // Localized strings collection.
   scoped_ptr<DictionaryValue> localized_strings_;
 
-  DISALLOW_COPY_AND_ASSIGN(OptionsUIHTMLSource);
+  DISALLOW_COPY_AND_ASSIGN(Options2UIHTMLSource);
 };
 
-OptionsUIHTMLSource::OptionsUIHTMLSource(DictionaryValue* localized_strings)
+Options2UIHTMLSource::Options2UIHTMLSource(DictionaryValue* localized_strings)
     : DataSource(chrome::kChromeUISettingsFrameHost, MessageLoop::current()) {
   DCHECK(localized_strings);
   localized_strings_.reset(localized_strings);
 }
 
-OptionsUIHTMLSource::~OptionsUIHTMLSource() {}
+Options2UIHTMLSource::~Options2UIHTMLSource() {}
 
-void OptionsUIHTMLSource::StartDataRequest(const std::string& path,
+void Options2UIHTMLSource::StartDataRequest(const std::string& path,
                                             bool is_incognito,
                                             int request_id) {
   scoped_refptr<RefCountedMemory> response_bytes;
@@ -142,7 +140,7 @@ void OptionsUIHTMLSource::StartDataRequest(const std::string& path,
   SendResponse(request_id, response_bytes);
 }
 
-std::string OptionsUIHTMLSource::GetMimeType(const std::string& path) const {
+std::string Options2UIHTMLSource::GetMimeType(const std::string& path) const {
   if (path == kLocalizedStringsFile || path == kOptionsBundleJsFile)
     return "application/javascript";
 
@@ -151,22 +149,22 @@ std::string OptionsUIHTMLSource::GetMimeType(const std::string& path) const {
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// OptionsPageUIHandler
+// OptionsPage2UIHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-OptionsPageUIHandler::OptionsPageUIHandler() {
+OptionsPage2UIHandler::OptionsPage2UIHandler() {
 }
 
-OptionsPageUIHandler::~OptionsPageUIHandler() {
+OptionsPage2UIHandler::~OptionsPage2UIHandler() {
 }
 
-bool OptionsPageUIHandler::IsEnabled() {
+bool OptionsPage2UIHandler::IsEnabled() {
   return true;
 }
 
 // static
-void OptionsPageUIHandler::RegisterStrings(
+void OptionsPage2UIHandler::RegisterStrings(
     DictionaryValue* localized_strings,
     const OptionsStringResource* resources,
     size_t length) {
@@ -176,7 +174,7 @@ void OptionsPageUIHandler::RegisterStrings(
   }
 }
 
-void OptionsPageUIHandler::RegisterTitle(DictionaryValue* localized_strings,
+void OptionsPage2UIHandler::RegisterTitle(DictionaryValue* localized_strings,
                                          const std::string& variable_name,
                                          int title_id) {
   localized_strings->SetString(variable_name,
@@ -189,18 +187,18 @@ void OptionsPageUIHandler::RegisterTitle(DictionaryValue* localized_strings,
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// OptionsUI
+// Options2UI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-OptionsUI::OptionsUI(TabContents* contents)
+Options2UI::Options2UI(TabContents* contents)
     : ChromeWebUI(contents),
       initialized_handlers_(false) {
   DictionaryValue* localized_strings = new DictionaryValue();
 
   CoreOptionsHandler* core_handler;
 #if defined(OS_CHROMEOS)
-  core_handler = new chromeos::options2::CoreChromeOSOptionsHandler();
+  core_handler = new chromeos::CoreChromeOSOptionsHandler();
 #else
   core_handler = new CoreOptionsHandler();
 #endif
@@ -217,7 +215,7 @@ OptionsUI::OptionsUI(TabContents* contents)
   AddOptionsPageUIHandler(localized_strings, new WebIntentsSettingsHandler());
 #if defined(OS_CHROMEOS)
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::CrosLanguageOptionsHandler());
+                          new chromeos::CrosLanguageOptionsHandler());
 #else
   AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler());
 #endif
@@ -231,33 +229,30 @@ OptionsUI::OptionsUI(TabContents* contents)
       g_browser_process->profile_manager()));
 #if defined(OS_CHROMEOS)
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::AboutPageHandler());
+                          new chromeos::AboutPageHandler());
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::AccountsOptionsHandler());
+                          new chromeos::AccountsOptionsHandler());
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::BluetoothOptionsHandler());
+                          new chromeos::BluetoothOptionsHandler());
   AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler());
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::LanguageChewingHandler());
-  AddOptionsPageUIHandler(
-      localized_strings,
-      new chromeos::options2::LanguageCustomizeModifierKeysHandler());
+                          new chromeos::LanguageChewingHandler());
+  AddOptionsPageUIHandler(localized_strings,
+                          new chromeos::LanguageCustomizeModifierKeysHandler());
+  AddOptionsPageUIHandler(localized_strings,
+                          new chromeos::LanguageHangulHandler());
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::LanguageHangulHandler());
+                          new chromeos::LanguageMozcHandler());
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::LanguageMozcHandler());
+                          new chromeos::LanguagePinyinHandler());
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::LanguagePinyinHandler());
-  AddOptionsPageUIHandler(
-      localized_strings,
-      new chromeos::options2::VirtualKeyboardManagerHandler());
+                          new chromeos::VirtualKeyboardManagerHandler());
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::ProxyHandler());
-  AddOptionsPageUIHandler(
-      localized_strings,
-      new chromeos::options2::ChangePictureOptionsHandler());
+                          new chromeos::ProxyHandler());
   AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options2::StatsOptionsHandler());
+                          new chromeos::ChangePictureOptionsHandler());
+  AddOptionsPageUIHandler(localized_strings,
+                          new chromeos::StatsOptionsHandler());
   AddOptionsPageUIHandler(localized_strings, new SystemOptionsHandler());
 #endif
 #if defined(USE_NSS)
@@ -266,8 +261,8 @@ OptionsUI::OptionsUI(TabContents* contents)
   AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler());
 
   // |localized_strings| ownership is taken over by this constructor.
-  OptionsUIHTMLSource* html_source =
-      new OptionsUIHTMLSource(localized_strings);
+  Options2UIHTMLSource* html_source =
+      new Options2UIHTMLSource(localized_strings);
 
   // Set up the chrome://settings-frame/ source.
   Profile* profile = Profile::FromBrowserContext(contents->browser_context());
@@ -279,34 +274,34 @@ OptionsUI::OptionsUI(TabContents* contents)
 
 #if defined(OS_CHROMEOS)
   // Set up the chrome://userimage/ source.
-  chromeos::options2::UserImageSource* user_image_source =
-      new chromeos::options2::UserImageSource();
+  chromeos::UserImageSource* user_image_source =
+      new chromeos::UserImageSource();
   profile->GetChromeURLDataManager()->AddDataSource(user_image_source);
 #endif
 }
 
-OptionsUI::~OptionsUI() {
+Options2UI::~Options2UI() {
   // Uninitialize all registered handlers. The base class owns them and it will
   // eventually delete them. Skip over the generic handler.
   for (std::vector<WebUIMessageHandler*>::iterator iter = handlers_.begin() + 1;
        iter != handlers_.end();
        ++iter) {
-    static_cast<OptionsPageUIHandler*>(*iter)->Uninitialize();
+    static_cast<OptionsPage2UIHandler*>(*iter)->Uninitialize();
   }
 }
 
 // Override.
-void OptionsUI::RenderViewCreated(RenderViewHost* render_view_host) {
+void Options2UI::RenderViewCreated(RenderViewHost* render_view_host) {
   SetCommandLineString(render_view_host);
   ChromeWebUI::RenderViewCreated(render_view_host);
 }
 
-void OptionsUI::RenderViewReused(RenderViewHost* render_view_host) {
+void Options2UI::RenderViewReused(RenderViewHost* render_view_host) {
   SetCommandLineString(render_view_host);
   ChromeWebUI::RenderViewReused(render_view_host);
 }
 
-void OptionsUI::DidBecomeActiveForReusedRenderView() {
+void Options2UI::DidBecomeActiveForReusedRenderView() {
   // When the renderer is re-used (e.g., for back/forward navigation within
   // options), the handlers are torn down and rebuilt, so are no longer
   // initialized, but the web page's DOM may remain intact, in which case onload
@@ -319,12 +314,12 @@ void OptionsUI::DidBecomeActiveForReusedRenderView() {
 }
 
 // static
-RefCountedMemory* OptionsUI::GetFaviconResourceBytes() {
+RefCountedMemory* Options2UI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_SETTINGS_FAVICON);
 }
 
-void OptionsUI::InitializeHandlers() {
+void Options2UI::InitializeHandlers() {
   DCHECK(!GetProfile()->IsOffTheRecord() || Profile::IsGuestSession());
 
   // The reinitialize call from DidBecomeActiveForReusedRenderView end up being
@@ -338,13 +333,13 @@ void OptionsUI::InitializeHandlers() {
   std::vector<WebUIMessageHandler*>::iterator iter;
   // Skip over the generic handler.
   for (iter = handlers_.begin() + 1; iter != handlers_.end(); ++iter) {
-    (static_cast<OptionsPageUIHandler*>(*iter))->Initialize();
+    (static_cast<OptionsPage2UIHandler*>(*iter))->Initialize();
   }
 }
 
-void OptionsUI::AddOptionsPageUIHandler(DictionaryValue* localized_strings,
-                                         OptionsPageUIHandler* handler_raw) {
-  scoped_ptr<OptionsPageUIHandler> handler(handler_raw);
+void Options2UI::AddOptionsPageUIHandler(DictionaryValue* localized_strings,
+                                         OptionsPage2UIHandler* handler_raw) {
+  scoped_ptr<OptionsPage2UIHandler> handler(handler_raw);
   DCHECK(handler.get());
   // Add only if handler's service is enabled.
   if (handler->IsEnabled()) {
@@ -354,7 +349,7 @@ void OptionsUI::AddOptionsPageUIHandler(DictionaryValue* localized_strings,
   }
 }
 
-void OptionsUI::SetCommandLineString(RenderViewHost* render_view_host) {
+void Options2UI::SetCommandLineString(RenderViewHost* render_view_host) {
   std::string command_line_string;
 
 #if defined(OS_WIN)
@@ -367,5 +362,3 @@ void OptionsUI::SetCommandLineString(RenderViewHost* render_view_host) {
 
   render_view_host->SetWebUIProperty("commandLineString", command_line_string);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/options_ui2.h b/chrome/browser/ui/webui/options2/options_ui2.h
index 352b5df..9a7a759 100644
--- a/chrome/browser/ui/webui/options2/options_ui2.h
+++ b/chrome/browser/ui/webui/options2/options_ui2.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_OPTIONS_UI2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI_H_
 #pragma once
 
 #include <string>
@@ -16,14 +16,12 @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_types.h"
 
-namespace options2 {
-
 // The base class handler of Javascript messages of options pages.
-class OptionsPageUIHandler : public WebUIMessageHandler,
+class OptionsPage2UIHandler : public WebUIMessageHandler,
                               public content::NotificationObserver {
  public:
-  OptionsPageUIHandler();
-  virtual ~OptionsPageUIHandler();
+  OptionsPage2UIHandler();
+  virtual ~OptionsPage2UIHandler();
 
   // Is this handler enabled?
   virtual bool IsEnabled();
@@ -66,25 +64,25 @@ class OptionsPageUIHandler : public WebUIMessageHandler,
   content::NotificationRegistrar registrar_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(OptionsPageUIHandler);
+  DISALLOW_COPY_AND_ASSIGN(OptionsPage2UIHandler);
 };
 
-// An interface for common operations that a host of OptionsPageUIHandlers
+// An interface for common operations that a host of OptionsPage2UIHandlers
 // should provide.
-class OptionsPageUIHandlerHost {
+class OptionsPage2UIHandlerHost {
  public:
   virtual void InitializeHandlers() = 0;
 
  protected:
-  virtual ~OptionsPageUIHandlerHost() {}
+  virtual ~OptionsPage2UIHandlerHost() {}
 };
 
 // The WebUI for chrome:settings-frame.
-class OptionsUI : public ChromeWebUI,
-                  public OptionsPageUIHandlerHost {
+class Options2UI : public ChromeWebUI,
+                   public OptionsPage2UIHandlerHost {
  public:
-  explicit OptionsUI(TabContents* contents);
-  virtual ~OptionsUI();
+  explicit Options2UI(TabContents* contents);
+  virtual ~Options2UI();
 
   static RefCountedMemory* GetFaviconResourceBytes();
 
@@ -93,13 +91,13 @@ class OptionsUI : public ChromeWebUI,
   virtual void RenderViewReused(RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidBecomeActiveForReusedRenderView() OVERRIDE;
 
-  // Overridden from OptionsPageUIHandlerHost:
+  // Overridden from OptionsPage2UIHandlerHost:
   virtual void InitializeHandlers() OVERRIDE;
 
  private:
   // Adds OptionsPageUiHandler to the handlers list if handler is enabled.
   void AddOptionsPageUIHandler(base::DictionaryValue* localized_strings,
-                               OptionsPageUIHandler* handler);
+                               OptionsPage2UIHandler* handler);
 
   // Sets the WebUI CommandLineString property with arguments passed while
   // launching chrome.
@@ -107,9 +105,7 @@ class OptionsUI : public ChromeWebUI,
 
   bool initialized_handlers_;
 
-  DISALLOW_COPY_AND_ASSIGN(OptionsUI);
+  DISALLOW_COPY_AND_ASSIGN(Options2UI);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI_H_
diff --git a/chrome/browser/ui/webui/options2/options_ui2_uitest.cc b/chrome/browser/ui/webui/options2/options_ui_uitest.cc
index afebd61..b292213 100644
--- a/chrome/browser/ui/webui/options2/options_ui2_uitest.cc
+++ b/chrome/browser/ui/webui/options2/options_ui_uitest.cc
@@ -2,7 +2,7 @@
 // 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/options2/options_ui2_uitest.h"
+#include "chrome/browser/ui/webui/options2/options_ui_uitest.h"
 
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
@@ -13,8 +13,6 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace options2 {
-
 OptionsUITest::OptionsUITest() {
   dom_automation_enabled_ = true;
 }
@@ -65,5 +63,3 @@ TEST_F(OptionsUITest, LoadOptionsByURL) {
   VerifyNavbar(tab);
   VerifySections(tab);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/options_ui2_uitest.h b/chrome/browser/ui/webui/options2/options_ui_uitest.h
index e184c4b..3cc6806 100644
--- a/chrome/browser/ui/webui/options2/options_ui2_uitest.h
+++ b/chrome/browser/ui/webui/options2/options_ui_uitest.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_OPTIONS_UI2_UITEST_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI2_UITEST_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI_UITEST_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI_UITEST_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
@@ -11,8 +11,6 @@
 
 class TabProxy;
 
-namespace options2 {
-
 class OptionsUITest : public UITest {
  public:
   OptionsUITest();
@@ -37,6 +35,4 @@ class OptionsUITest : public UITest {
   void VerifySections(scoped_refptr<TabProxy> tab);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI2_UITEST_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI_UITEST_H_
diff --git a/chrome/browser/ui/webui/options2/password_manager2_browsertest.js b/chrome/browser/ui/webui/options2/password_manager_browsertest.js
index 98c632d..98c632d 100644
--- a/chrome/browser/ui/webui/options2/password_manager2_browsertest.js
+++ b/chrome/browser/ui/webui/options2/password_manager_browsertest.js
diff --git a/chrome/browser/ui/webui/options2/password_manager_handler2.cc b/chrome/browser/ui/webui/options2/password_manager_handler.cc
index 4951962e..29d45c0 100644
--- a/chrome/browser/ui/webui/options2/password_manager_handler2.cc
+++ b/chrome/browser/ui/webui/options2/password_manager_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/password_manager_handler2.h"
+#include "chrome/browser/ui/webui/options2/password_manager_handler.h"
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
@@ -22,8 +22,6 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/forms/password_form.h"
 
-namespace options2 {
-
 PasswordManagerHandler::PasswordManagerHandler()
     : ALLOW_THIS_IN_INITIALIZER_LIST(populater_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(exception_populater_(this)) {
@@ -133,7 +131,7 @@ void PasswordManagerHandler::Observe(
     }
   }
 
-  OptionsPageUIHandler::Observe(type, source, details);
+  OptionsPage2UIHandler::Observe(type, source, details);
 }
 
 void PasswordManagerHandler::UpdatePasswordLists(const ListValue* args) {
@@ -291,5 +289,3 @@ void PasswordManagerHandler::PasswordExceptionListPopulater::
                                          result.begin(), result.end());
   page_->SetPasswordExceptionList();
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/password_manager_handler2.h b/chrome/browser/ui/webui/options2/password_manager_handler.h
index 76f91c7..475c431 100644
--- a/chrome/browser/ui/webui/options2/password_manager_handler2.h
+++ b/chrome/browser/ui/webui/options2/password_manager_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_PASSWORD_MANAGER_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_PASSWORD_MANAGER_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_PASSWORD_MANAGER_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_PASSWORD_MANAGER_HANDLER_H_
 
 #include <string>
 #include <vector>
@@ -20,15 +20,13 @@ struct PasswordForm;
 }
 }
 
-namespace options2 {
-
-class PasswordManagerHandler : public OptionsPageUIHandler,
+class PasswordManagerHandler : public OptionsPage2UIHandler,
                                public PasswordStore::Observer {
  public:
   PasswordManagerHandler();
   virtual ~PasswordManagerHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
   virtual void Initialize() OVERRIDE;
   virtual void RegisterMessages() OVERRIDE;
@@ -134,6 +132,4 @@ class PasswordManagerHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(PasswordManagerHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_PASSWORD_MANAGER_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_PASSWORD_MANAGER_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/personal_options2_browsertest.js b/chrome/browser/ui/webui/options2/personal_options_browsertest.js
index 222adfa..222adfa 100644
--- a/chrome/browser/ui/webui/options2/personal_options2_browsertest.js
+++ b/chrome/browser/ui/webui/options2/personal_options_browsertest.js
diff --git a/chrome/browser/ui/webui/options2/personal_options_handler2.cc b/chrome/browser/ui/webui/options2/personal_options_handler.cc
index c756cc7..0a2a367 100644
--- a/chrome/browser/ui/webui/options2/personal_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/personal_options_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/personal_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/personal_options_handler.h"
 
 #include <string>
 
@@ -55,8 +55,6 @@
 
 using content::UserMetricsAction;
 
-namespace options2 {
-
 PersonalOptionsHandler::PersonalOptionsHandler() {
   multiprofile_ = ProfileManager::IsMultipleProfilesEnabled();
 #if defined(OS_CHROMEOS)
@@ -247,7 +245,7 @@ void PersonalOptionsHandler::Observe(
     UpdateAccountPicture();
 #endif
   } else {
-    OptionsPageUIHandler::Observe(type, source, details);
+    OptionsPage2UIHandler::Observe(type, source, details);
   }
 }
 
@@ -444,5 +442,3 @@ void PersonalOptionsHandler::SendProfilesInfo() {
 void PersonalOptionsHandler::CreateProfile(const ListValue* args) {
   ProfileManager::CreateMultiProfileAsync();
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/personal_options_handler2.h b/chrome/browser/ui/webui/options2/personal_options_handler.h
index 8420d39..4ffe0b6 100644
--- a/chrome/browser/ui/webui/options2/personal_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/personal_options_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_PERSONAL_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_PERSONAL_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_PERSONAL_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_PERSONAL_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -13,16 +13,14 @@
 #include "content/public/browser/notification_registrar.h"
 #endif
 
-namespace options2 {
-
 // Chrome personal options page UI handler.
-class PersonalOptionsHandler : public OptionsPageUIHandler,
+class PersonalOptionsHandler : public OptionsPage2UIHandler,
                                public ProfileSyncServiceObserver {
  public:
   PersonalOptionsHandler();
   virtual ~PersonalOptionsHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
   virtual void Initialize() OVERRIDE;
 
@@ -69,6 +67,4 @@ class PersonalOptionsHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(PersonalOptionsHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_PERSONAL_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_PERSONAL_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/search_engine_manager2_browsertest.js b/chrome/browser/ui/webui/options2/search_engine_manager_browsertest.js
index 9fe2165..9fe2165 100644
--- a/chrome/browser/ui/webui/options2/search_engine_manager2_browsertest.js
+++ b/chrome/browser/ui/webui/options2/search_engine_manager_browsertest.js
diff --git a/chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc b/chrome/browser/ui/webui/options2/search_engine_manager_handler.cc
index d3b7be9..1e289d8 100644
--- a/chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc
+++ b/chrome/browser/ui/webui/options2/search_engine_manager_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/search_engine_manager_handler2.h"
+#include "chrome/browser/ui/webui/options2/search_engine_manager_handler.h"
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
@@ -30,8 +30,6 @@ enum EngineInfoIndexes {
 
 };  // namespace
 
-namespace options2 {
-
 SearchEngineManagerHandler::SearchEngineManagerHandler() {
 }
 
@@ -313,5 +311,3 @@ void SearchEngineManagerHandler::EditCompleted(const ListValue* args) {
   }
   edit_controller_->AcceptAddOrEdit(name, keyword, url);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/search_engine_manager_handler2.h b/chrome/browser/ui/webui/options2/search_engine_manager_handler.h
index fae21dc..aa6815d 100644
--- a/chrome/browser/ui/webui/options2/search_engine_manager_handler2.h
+++ b/chrome/browser/ui/webui/options2/search_engine_manager_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_SEARCH_ENGINE_MANAGER_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_SEARCH_ENGINE_MANAGER_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_SEARCH_ENGINE_MANAGER_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_SEARCH_ENGINE_MANAGER_HANDLER_H_
 
 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
@@ -12,9 +12,7 @@
 class Extension;
 class KeywordEditorController;
 
-namespace options2 {
-
-class SearchEngineManagerHandler : public OptionsPageUIHandler,
+class SearchEngineManagerHandler : public OptionsPage2UIHandler,
                                    public ui::TableModelObserver,
                                    public EditSearchEngineControllerDelegate {
  public:
@@ -23,7 +21,7 @@ class SearchEngineManagerHandler : public OptionsPageUIHandler,
 
   virtual void Initialize() OVERRIDE;
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
 
@@ -78,6 +76,4 @@ class SearchEngineManagerHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(SearchEngineManagerHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_SEARCH_ENGINE_MANAGER_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_SEARCH_ENGINE_MANAGER_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/stop_syncing_handler2.cc b/chrome/browser/ui/webui/options2/stop_syncing_handler.cc
index 3e67b8ee..550cc4c 100644
--- a/chrome/browser/ui/webui/options2/stop_syncing_handler2.cc
+++ b/chrome/browser/ui/webui/options2/stop_syncing_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/stop_syncing_handler2.h"
+#include "chrome/browser/ui/webui/options2/stop_syncing_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ -17,8 +17,6 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace options2 {
-
 StopSyncingHandler::StopSyncingHandler() {
 }
 
@@ -54,5 +52,3 @@ void StopSyncingHandler::StopSyncing(const ListValue* args){
     ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
   }
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/stop_syncing_handler2.h b/chrome/browser/ui/webui/options2/stop_syncing_handler.h
index 67f78f9..2c8b626 100644
--- a/chrome/browser/ui/webui/options2/stop_syncing_handler2.h
+++ b/chrome/browser/ui/webui/options2/stop_syncing_handler.h
@@ -2,20 +2,18 @@
 // 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_OPTIONS2_STOP_SYNCING_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_STOP_SYNCING_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_STOP_SYNCING_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_STOP_SYNCING_HANDLER_H_
 
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 
-namespace options2 {
-
 // Chrome personal stuff stop syncing overlay UI handler.
-class StopSyncingHandler : public OptionsPageUIHandler {
+class StopSyncingHandler : public OptionsPage2UIHandler {
  public:
   StopSyncingHandler();
   virtual ~StopSyncingHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
 
@@ -28,6 +26,4 @@ class StopSyncingHandler : public OptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(StopSyncingHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_STOP_SYNCING_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_STOP_SYNCING_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options2/web_intents_settings_handler2.cc b/chrome/browser/ui/webui/options2/web_intents_settings_handler.cc
index c6f7a21..874cf834 100644
--- a/chrome/browser/ui/webui/options2/web_intents_settings_handler2.cc
+++ b/chrome/browser/ui/webui/options2/web_intents_settings_handler.cc
@@ -2,7 +2,7 @@
 // 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/options2/web_intents_settings_handler2.h"
+#include "chrome/browser/ui/webui/options2/web_intents_settings_handler.h"
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
@@ -21,8 +21,6 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace options2 {
-
 WebIntentsSettingsHandler::WebIntentsSettingsHandler()
     : web_intents_registry_(NULL),
       batch_update_(false) {
@@ -160,5 +158,3 @@ void WebIntentsSettingsHandler::SendChildren(WebIntentsTreeNode* parent) {
 
   web_ui_->CallJavascriptFunction("IntentsView.loadChildren", args);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/options2/web_intents_settings_handler2.h b/chrome/browser/ui/webui/options2/web_intents_settings_handler.h
index 2f2d19a..186b295 100644
--- a/chrome/browser/ui/webui/options2/web_intents_settings_handler2.h
+++ b/chrome/browser/ui/webui/options2/web_intents_settings_handler.h
@@ -2,8 +2,8 @@
 // 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_OPTIONS2_WEB_INTENTS_SETTINGS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_WEB_INTENTS_SETTINGS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_WEB_INTENTS_SETTINGS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_WEB_INTENTS_SETTINGS_HANDLER_H_
 #pragma once
 
 #include "base/compiler_specific.h"
@@ -13,16 +13,14 @@
 
 class WebIntentsRegistry;
 
-namespace options2 {
-
 // Manage setting up the backing data for the web intents options page.
-class WebIntentsSettingsHandler : public OptionsPageUIHandler,
+class WebIntentsSettingsHandler : public OptionsPage2UIHandler,
                                   public WebIntentsModel::Observer {
  public:
   WebIntentsSettingsHandler();
   virtual ~WebIntentsSettingsHandler();
 
-  // OptionsPageUIHandler implementation.
+  // OptionsPage2UIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void RegisterMessages() OVERRIDE;
@@ -76,6 +74,4 @@ class WebIntentsSettingsHandler : public OptionsPageUIHandler,
   DISALLOW_COPY_AND_ASSIGN(WebIntentsSettingsHandler);
 };
 
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_WEB_INTENTS_SETTINGS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_WEB_INTENTS_SETTINGS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/sync_promo/sync_promo_handler2.cc b/chrome/browser/ui/webui/sync_promo/sync_promo_handler2.cc
index 107c8d5..3892f08 100644
--- a/chrome/browser/ui/webui/sync_promo/sync_promo_handler2.cc
+++ b/chrome/browser/ui/webui/sync_promo/sync_promo_handler2.cc
@@ -66,8 +66,6 @@ static void RecordExperimentOutcomesOnSignIn() {
 
 }  // namespace
 
-namespace options2 {
-
 SyncPromoHandler2::SyncPromoHandler2(ProfileManager* profile_manager)
     : SyncSetupHandler2(profile_manager),
       window_already_closed_(false) {
@@ -292,5 +290,3 @@ void SyncPromoHandler2::RecordUserFlowAction(int action) {
   UMA_HISTOGRAM_ENUMERATION("SyncPromo.UserFlow", action,
                             SYNC_PROMO_BUCKET_BOUNDARY);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/sync_promo/sync_promo_handler2.h b/chrome/browser/ui/webui/sync_promo/sync_promo_handler2.h
index 3c6561d..0726ae4 100644
--- a/chrome/browser/ui/webui/sync_promo/sync_promo_handler2.h
+++ b/chrome/browser/ui/webui/sync_promo/sync_promo_handler2.h
@@ -10,8 +10,6 @@
 
 class PrefService;
 
-namespace options2 {
-
 // The handler for JavaScript messages related to the "sync promo" page.
 class SyncPromoHandler2 : public SyncSetupHandler2 {
  public:
@@ -96,6 +94,4 @@ class SyncPromoHandler2 : public SyncSetupHandler2 {
   DISALLOW_COPY_AND_ASSIGN(SyncPromoHandler2);
 };
 
-}  // namespace options2
-
 #endif  // CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_SYNC_PROMO_HANDLER2_H_
diff --git a/chrome/browser/ui/webui/sync_setup_handler2.cc b/chrome/browser/ui/webui/sync_setup_handler2.cc
index 71f7fa0..ae50432 100644
--- a/chrome/browser/ui/webui/sync_setup_handler2.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler2.cc
@@ -233,8 +233,6 @@ bool AreUserNamesEqual(const string16& user1, const string16& user2) {
 
 }  // namespace
 
-namespace options2 {
-
 SyncSetupHandler2::SyncSetupHandler2(ProfileManager* profile_manager)
     : flow_(NULL),
       profile_manager_(profile_manager) {
@@ -772,5 +770,3 @@ void SyncSetupHandler2::ShowLoginErrorMessage(const string16& error_message) {
   args.SetString("error_message", error_message);
   ShowGaiaLogin(args);
 }
-
-}  // namespace options2
diff --git a/chrome/browser/ui/webui/sync_setup_handler2.h b/chrome/browser/ui/webui/sync_setup_handler2.h
index 9413eae..a5bc2e5 100644
--- a/chrome/browser/ui/webui/sync_setup_handler2.h
+++ b/chrome/browser/ui/webui/sync_setup_handler2.h
@@ -14,10 +14,8 @@
 class SyncSetupFlow;
 class ProfileManager;
 
-namespace options2 {
-
 class SyncSetupHandler2 : public GaiaOAuthConsumer,
-                          public OptionsPageUIHandler,
+                          public OptionsPage2UIHandler,
                           public SyncSetupFlowHandler {
  public:
   // Constructs a new SyncSetupHandler. |profile_manager| may be NULL.
@@ -116,6 +114,4 @@ class SyncSetupHandler2 : public GaiaOAuthConsumer,
   DISALLOW_COPY_AND_ASSIGN(SyncSetupHandler2);
 };
 
-}  // namespace options2
-
 #endif  // CHROME_BROWSER_UI_WEBUI_SYNC_SETUP_HANDLER2_H_
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 33696c5..2e3851e 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3934,94 +3934,94 @@
         'browser/ui/webui/options/stop_syncing_handler.h',
         'browser/ui/webui/options/web_intents_settings_handler.cc',
         'browser/ui/webui/options/web_intents_settings_handler.h',
-        'browser/ui/webui/options2/advanced_options_handler2.cc',
-        'browser/ui/webui/options2/advanced_options_handler2.h',
-        'browser/ui/webui/options2/advanced_options_utils2.h',
-        'browser/ui/webui/options2/advanced_options_utils2_mac.mm',
-        'browser/ui/webui/options2/advanced_options_utils2_win.cc',
-        'browser/ui/webui/options2/advanced_options_utils2_x11.cc',
-        'browser/ui/webui/options2/autofill_options_handler2.cc',
-        'browser/ui/webui/options2/autofill_options_handler2.h',
-        'browser/ui/webui/options2/browser_options_handler2.cc',
-        'browser/ui/webui/options2/browser_options_handler2.h',
-        'browser/ui/webui/options2/certificate_manager_handler2.cc',
-        'browser/ui/webui/options2/certificate_manager_handler2.h',
-        'browser/ui/webui/options2/chromeos/about_page_handler2.cc',
-        'browser/ui/webui/options2/chromeos/about_page_handler2.h',
-        'browser/ui/webui/options2/chromeos/accounts_options_handler2.cc',
-        'browser/ui/webui/options2/chromeos/accounts_options_handler2.h',
-        'browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc',
-        'browser/ui/webui/options2/chromeos/bluetooth_options_handler2.h',
-        'browser/ui/webui/options2/chromeos/change_picture_options_handler2.cc',
-        'browser/ui/webui/options2/chromeos/change_picture_options_handler2.h',
-        'browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.cc',
-        'browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.h',
-        'browser/ui/webui/options2/chromeos/cros_language_options_handler2.cc',
-        'browser/ui/webui/options2/chromeos/cros_language_options_handler2.h',
-        'browser/ui/webui/options2/chromeos/internet_options_handler2.cc',
-        'browser/ui/webui/options2/chromeos/internet_options_handler2.h',
-        'browser/ui/webui/options2/chromeos/language_chewing_handler2.cc',
-        'browser/ui/webui/options2/chromeos/language_chewing_handler2.h',
-        'browser/ui/webui/options2/chromeos/language_customize_modifier_keys_handler2.cc',
-        'browser/ui/webui/options2/chromeos/language_customize_modifier_keys_handler2.h',
-        'browser/ui/webui/options2/chromeos/language_hangul_handler2.cc',
-        'browser/ui/webui/options2/chromeos/language_hangul_handler2.h',
-        'browser/ui/webui/options2/chromeos/language_mozc_handler2.cc',
-        'browser/ui/webui/options2/chromeos/language_mozc_handler2.h',
-        'browser/ui/webui/options2/chromeos/language_options_util2.cc',
-        'browser/ui/webui/options2/chromeos/language_options_util2.h',
-        'browser/ui/webui/options2/chromeos/language_pinyin_handler2.cc',
-        'browser/ui/webui/options2/chromeos/language_pinyin_handler2.h',
-        'browser/ui/webui/options2/chromeos/proxy_handler2.cc',
-        'browser/ui/webui/options2/chromeos/proxy_handler2.h',
-        'browser/ui/webui/options2/chromeos/stats_options_handler2.cc',
-        'browser/ui/webui/options2/chromeos/stats_options_handler2.h',
-        'browser/ui/webui/options2/chromeos/system_options_handler2.cc',
-        'browser/ui/webui/options2/chromeos/system_options_handler2.h',
-        'browser/ui/webui/options2/chromeos/system_settings_provider2.cc',
-        'browser/ui/webui/options2/chromeos/system_settings_provider2.h',
-        'browser/ui/webui/options2/chromeos/user_image_source2.cc',
-        'browser/ui/webui/options2/chromeos/user_image_source2.h',
-        'browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2.cc',
-        'browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2.h',
-        'browser/ui/webui/options2/clear_browser_data_handler2.cc',
-        'browser/ui/webui/options2/clear_browser_data_handler2.h',
-        'browser/ui/webui/options2/content_settings_handler2.cc',
-        'browser/ui/webui/options2/content_settings_handler2.h',
-        'browser/ui/webui/options2/cookies_view_handler2.cc',
-        'browser/ui/webui/options2/cookies_view_handler2.h',
-        'browser/ui/webui/options2/core_options_handler2.cc',
-        'browser/ui/webui/options2/core_options_handler2.h',
-        'browser/ui/webui/options2/font_settings_handler2.cc',
-        'browser/ui/webui/options2/font_settings_handler2.h',
-        'browser/ui/webui/options2/font_settings_utils2.h',
-        'browser/ui/webui/options2/font_settings_utils2_mac.mm',
-        'browser/ui/webui/options2/font_settings_utils2_win.cc',
-        'browser/ui/webui/options2/font_settings_utils2_x11.cc',
-        'browser/ui/webui/options2/handler_options_handler2.cc',
-        'browser/ui/webui/options2/handler_options_handler2.h',
-        'browser/ui/webui/options2/import_data_handler2.cc',
-        'browser/ui/webui/options2/import_data_handler2.h',
-        'browser/ui/webui/options2/language_options_handler2.cc',
-        'browser/ui/webui/options2/language_options_handler2.h',
-        'browser/ui/webui/options2/language_options_handler_common2.cc',
-        'browser/ui/webui/options2/language_options_handler_common2.h',
-        'browser/ui/webui/options2/manage_profile_handler2.cc',
-        'browser/ui/webui/options2/manage_profile_handler2.h',
-        'browser/ui/webui/options2/options_sync_setup_handler2.cc',
-        'browser/ui/webui/options2/options_sync_setup_handler2.h',
+        'browser/ui/webui/options2/advanced_options_handler.cc',
+        'browser/ui/webui/options2/advanced_options_handler.h',
+        'browser/ui/webui/options2/advanced_options_utils.h',
+        'browser/ui/webui/options2/advanced_options_utils_mac.mm',
+        'browser/ui/webui/options2/advanced_options_utils_win.cc',
+        'browser/ui/webui/options2/advanced_options_utils_x11.cc',
+        'browser/ui/webui/options2/autofill_options_handler.cc',
+        'browser/ui/webui/options2/autofill_options_handler.h',
+        'browser/ui/webui/options2/browser_options_handler.cc',
+        'browser/ui/webui/options2/browser_options_handler.h',
+        'browser/ui/webui/options2/certificate_manager_handler.cc',
+        'browser/ui/webui/options2/certificate_manager_handler.h',
+        'browser/ui/webui/options2/chromeos/about_page_handler.cc',
+        'browser/ui/webui/options2/chromeos/about_page_handler.h',
+        'browser/ui/webui/options2/chromeos/accounts_options_handler.cc',
+        'browser/ui/webui/options2/chromeos/accounts_options_handler.h',
+        'browser/ui/webui/options2/chromeos/bluetooth_options_handler.cc',
+        'browser/ui/webui/options2/chromeos/bluetooth_options_handler.h',
+        'browser/ui/webui/options2/chromeos/change_picture_options_handler.cc',
+        'browser/ui/webui/options2/chromeos/change_picture_options_handler.h',
+        'browser/ui/webui/options2/chromeos/core_chromeos_options_handler.cc',
+        'browser/ui/webui/options2/chromeos/core_chromeos_options_handler.h',
+        'browser/ui/webui/options2/chromeos/cros_language_options_handler.cc',
+        'browser/ui/webui/options2/chromeos/cros_language_options_handler.h',
+        'browser/ui/webui/options2/chromeos/internet_options_handler.cc',
+        'browser/ui/webui/options2/chromeos/internet_options_handler.h',
+        'browser/ui/webui/options2/chromeos/language_chewing_handler.cc',
+        'browser/ui/webui/options2/chromeos/language_chewing_handler.h',
+        'browser/ui/webui/options2/chromeos/language_customize_modifier_keys_handler.cc',
+        'browser/ui/webui/options2/chromeos/language_customize_modifier_keys_handler.h',
+        'browser/ui/webui/options2/chromeos/language_hangul_handler.cc',
+        'browser/ui/webui/options2/chromeos/language_hangul_handler.h',
+        'browser/ui/webui/options2/chromeos/language_mozc_handler.cc',
+        'browser/ui/webui/options2/chromeos/language_mozc_handler.h',
+        'browser/ui/webui/options2/chromeos/language_options_util.cc',
+        'browser/ui/webui/options2/chromeos/language_options_util.h',
+        'browser/ui/webui/options2/chromeos/language_pinyin_handler.cc',
+        'browser/ui/webui/options2/chromeos/language_pinyin_handler.h',
+        'browser/ui/webui/options2/chromeos/proxy_handler.cc',
+        'browser/ui/webui/options2/chromeos/proxy_handler.h',
+        'browser/ui/webui/options2/chromeos/stats_options_handler.cc',
+        'browser/ui/webui/options2/chromeos/stats_options_handler.h',
+        'browser/ui/webui/options2/chromeos/system_options_handler.cc',
+        'browser/ui/webui/options2/chromeos/system_options_handler.h',
+        'browser/ui/webui/options2/chromeos/system_settings_provider.cc',
+        'browser/ui/webui/options2/chromeos/system_settings_provider.h',
+        'browser/ui/webui/options2/chromeos/user_image_source.cc',
+        'browser/ui/webui/options2/chromeos/user_image_source.h',
+        'browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler.cc',
+        'browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler.h',
+        'browser/ui/webui/options2/clear_browser_data_handler.cc',
+        'browser/ui/webui/options2/clear_browser_data_handler.h',
+        'browser/ui/webui/options2/content_settings_handler.cc',
+        'browser/ui/webui/options2/content_settings_handler.h',
+        'browser/ui/webui/options2/cookies_view_handler.cc',
+        'browser/ui/webui/options2/cookies_view_handler.h',
+        'browser/ui/webui/options2/core_options_handler.cc',
+        'browser/ui/webui/options2/core_options_handler.h',
+        'browser/ui/webui/options2/font_settings_handler.cc',
+        'browser/ui/webui/options2/font_settings_handler.h',
+        'browser/ui/webui/options2/font_settings_utils.h',
+        'browser/ui/webui/options2/font_settings_utils_mac.mm',
+        'browser/ui/webui/options2/font_settings_utils_win.cc',
+        'browser/ui/webui/options2/font_settings_utils_x11.cc',
+        'browser/ui/webui/options2/handler_options_handler.cc',
+        'browser/ui/webui/options2/handler_options_handler.h',
+        'browser/ui/webui/options2/import_data_handler.cc',
+        'browser/ui/webui/options2/import_data_handler.h',
+        'browser/ui/webui/options2/language_options_handler.cc',
+        'browser/ui/webui/options2/language_options_handler.h',
+        'browser/ui/webui/options2/language_options_handler_common.cc',
+        'browser/ui/webui/options2/language_options_handler_common.h',
+        'browser/ui/webui/options2/manage_profile_handler.cc',
+        'browser/ui/webui/options2/manage_profile_handler.h',
+        'browser/ui/webui/options2/options_sync_setup_handler.cc',
+        'browser/ui/webui/options2/options_sync_setup_handler.h',
         'browser/ui/webui/options2/options_ui2.cc',
         'browser/ui/webui/options2/options_ui2.h',
-        'browser/ui/webui/options2/password_manager_handler2.cc',
-        'browser/ui/webui/options2/password_manager_handler2.h',
-        'browser/ui/webui/options2/personal_options_handler2.cc',
-        'browser/ui/webui/options2/personal_options_handler2.h',
-        'browser/ui/webui/options2/search_engine_manager_handler2.cc',
-        'browser/ui/webui/options2/search_engine_manager_handler2.h',
-        'browser/ui/webui/options2/stop_syncing_handler2.cc',
-        'browser/ui/webui/options2/stop_syncing_handler2.h',
-        'browser/ui/webui/options2/web_intents_settings_handler2.cc',
-        'browser/ui/webui/options2/web_intents_settings_handler2.h',
+        'browser/ui/webui/options2/password_manager_handler.cc',
+        'browser/ui/webui/options2/password_manager_handler.h',
+        'browser/ui/webui/options2/personal_options_handler.cc',
+        'browser/ui/webui/options2/personal_options_handler.h',
+        'browser/ui/webui/options2/search_engine_manager_handler.cc',
+        'browser/ui/webui/options2/search_engine_manager_handler.h',
+        'browser/ui/webui/options2/stop_syncing_handler.cc',
+        'browser/ui/webui/options2/stop_syncing_handler.h',
+        'browser/ui/webui/options2/web_intents_settings_handler.cc',
+        'browser/ui/webui/options2/web_intents_settings_handler.h',
         'browser/ui/webui/plugins_ui.cc',
         'browser/ui/webui/plugins_ui.h',
         'browser/ui/webui/policy_ui.cc',
@@ -4474,8 +4474,8 @@
             'browser/certificate_manager_model.h',
             'browser/ui/webui/options/certificate_manager_handler.cc',
             'browser/ui/webui/options/certificate_manager_handler.h',
-            'browser/ui/webui/options2/certificate_manager_handler2.cc',
-            'browser/ui/webui/options2/certificate_manager_handler2.h',
+            'browser/ui/webui/options2/certificate_manager_handler.cc',
+            'browser/ui/webui/options2/certificate_manager_handler.h',
             'browser/ui/webui/ssl_client_certificate_selector_webui.cc',
             'browser/ui/webui/ssl_client_certificate_selector_webui.h',
           ],