Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/bluetooth_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_BLUETOOTH_OPTIONS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
 #include "chrome/browser/ui/webui/options2/options_ui.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace chromeos {
-namespace options2 {
+namespace options {
 
 // Handler for Bluetooth options on the system options page.
-class BluetoothOptionsHandler : public ::options2::OptionsPageUIHandler,
+class BluetoothOptionsHandler : public ::options::OptionsPageUIHandler,
                                 public chromeos::BluetoothAdapter::Observer,
                                 public BluetoothDevice::PairingDelegate {
  public:
   BluetoothOptionsHandler();
   virtual ~BluetoothOptionsHandler();
 
   // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void RegisterMessages() OVERRIDE;
@@ skipping 149 matching lines @@
   // Default bluetooth adapter, used for all operations.
   scoped_refptr<BluetoothAdapter> adapter_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than this object does.
   base::WeakPtrFactory<BluetoothOptionsHandler> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothOptionsHandler);
 };
 
-}  // namespace options2
+}  // namespace options
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_BLUETOOTH_OPTIONS_HANDLER_H_