Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 30 matching lines @@
 // action.
 const char kEnterPinCode[] = "bluetoothEnterPinCode";
 const char kEnterPasskey[] = "bluetoothEnterPasskey";
 const char kRemotePinCode[] = "bluetoothRemotePinCode";
 const char kRemotePasskey[] = "bluetoothRemotePasskey";
 const char kConfirmPasskey[] = "bluetoothConfirmPasskey";
 
 }  // namespace
 
 namespace chromeos {
-namespace options2 {
+namespace options {
 
 BluetoothOptionsHandler::BluetoothOptionsHandler() : weak_ptr_factory_(this) {
 }
 
 BluetoothOptionsHandler::~BluetoothOptionsHandler() {
   if (adapter_.get())
     adapter_->RemoveObserver(this);
 }
 
 void BluetoothOptionsHandler::GetLocalizedValues(
@@ skipping 355 matching lines @@
                                             BluetoothDevice* device) {
   DCHECK(adapter == adapter_.get());
   DCHECK(device);
 
   base::StringValue address(device->address());
   web_ui()->CallJavascriptFunction(
       "options.BrowserOptions.removeBluetoothDevice",
       address);
 }
 
-}  // namespace options2
+}  // namespace options
 }  // namespace chromeos