Options: Rename options2 namespace to options.

chrome/browser/ui/webui/chromeos/proxy_settings_ui.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_
 
 #include "chrome/browser/ui/webui/options2/options_ui.h"
 #include "content/public/browser/web_ui_controller.h"
 
 namespace chromeos {
 
-namespace options2 {
+namespace options {
 class CoreChromeOSOptionsHandler;
 class ProxyHandler;
 }
 
 // A WebUI to host proxy settings splitted from settings page for better
 // performance.
 class ProxySettingsUI : public content::WebUIController,
-                        public ::options2::OptionsPageUIHandlerHost {
+                        public ::options::OptionsPageUIHandlerHost {
  public:
   explicit ProxySettingsUI(content::WebUI* web_ui);
   virtual ~ProxySettingsUI();
 
  private:
   // Overridden from OptionsPageUIHandlerHost:
   virtual void InitializeHandlers() OVERRIDE;
 
-  options2::ProxyHandler* proxy_handler_;  // Weak ptr.
-  options2::CoreChromeOSOptionsHandler* core_handler_; // WeakPtr.
+  options::ProxyHandler* proxy_handler_;  // Weak ptr.
+  options::CoreChromeOSOptionsHandler* core_handler_; // WeakPtr.
 
   DISALLOW_COPY_AND_ASSIGN(ProxySettingsUI);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_