Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/internet_options_handler.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_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/cros/network_ui_data.h"
 #include "chrome/browser/ui/webui/options2/options_ui.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/gfx/native_widget_types.h"
 
 class Browser;
 
 namespace gfx {
 class ImageSkia;
 }
 
 namespace views {
 class WidgetDelegate;
 }
 
-namespace options2 {
+namespace options {
 
 // ChromeOS internet options page UI handler.
 class InternetOptionsHandler
   : public OptionsPageUIHandler,
     public chromeos::NetworkLibrary::NetworkManagerObserver,
     public chromeos::NetworkLibrary::NetworkObserver,
     public chromeos::NetworkLibrary::CellularDataPlanObserver {
  public:
   InternetOptionsHandler();
   virtual ~InternetOptionsHandler();
@@ skipping 143 matching lines @@
   content::NotificationRegistrar registrar_;
 
   // Weak pointer factory so we can start connections at a later time
   // without worrying that they will actually try to happen after the lifetime
   // of this object.
   base::WeakPtrFactory<InternetOptionsHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler);
 };
 
-}  // namespace options2
+}  // namespace options
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_