Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/options_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_OPTIONS2_OPTIONS_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 14 matching lines @@
 }
 
 #if defined(OS_CHROMEOS)
 namespace chromeos {
 namespace system {
 class PointerDeviceObserver;
 }  // namespace system
 }  // namespace chromeos
 #endif
 
-namespace options2 {
+namespace options {
 
 // The base class handler of Javascript messages of options pages.
 class OptionsPageUIHandler : public content::WebUIMessageHandler,
                              public content::NotificationObserver {
  public:
   OptionsPageUIHandler();
   virtual ~OptionsPageUIHandler();
 
   // Is this handler enabled?
   virtual bool IsEnabled();
@@ skipping 83 matching lines @@
   std::vector<OptionsPageUIHandler*> handlers_;
 
 #if defined(OS_CHROMEOS)
   scoped_ptr<chromeos::system::PointerDeviceObserver>
       pointer_device_observer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(OptionsUI);
 };
 
-}  // namespace options2
+}  // namespace options
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI_H_