Moved bluetooth adapter files to device/bluetooth/.

chrome/browser/extensions/bluetooth_event_router.cc

Index: chrome/browser/extensions/bluetooth_event_router.cc
diff --git a/chrome/browser/chromeos/extensions/bluetooth_event_router.cc b/chrome/browser/extensions/bluetooth_event_router.cc
similarity index 85%
rename from chrome/browser/chromeos/extensions/bluetooth_event_router.cc
rename to chrome/browser/extensions/bluetooth_event_router.cc
index 64331bf5e68518d60bb79c8183fe8048bf522f58..d39ffadc4c3445f40fbae215c7d668a3d40ae09e 100644
--- a/chrome/browser/chromeos/extensions/bluetooth_event_router.cc
+++ b/chrome/browser/extensions/bluetooth_event_router.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/extensions/bluetooth_event_router.h"
+#include "chrome/browser/extensions/bluetooth_event_router.h"
 
 #include <map>
 
@@ -10,30 +10,35 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter_factory.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_socket.h"
 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/common/extensions/api/experimental_bluetooth.h"
+#include "device/bluetooth/bluetooth_adapter.h"
+#include "device/bluetooth/bluetooth_adapter_factory.h"
+#include "device/bluetooth/bluetooth_device.h"
+#include "device/bluetooth/bluetooth_socket.h"
+
+using bluetooth::BluetoothSocket;

[bryeung, 2012/10/10 15:03:53]

use all or none of the Bluetooth classes you're using.  None is probably better
here: it doesn't look that bad with the bluetooth:: prefixes.

[youngki, 2012/10/10 18:34:57]

Done.

 
 namespace experimental_bluetooth = extensions::api::experimental_bluetooth;
 
-namespace chromeos {
+namespace extensions {
 
 ExtensionBluetoothEventRouter::ExtensionBluetoothEventRouter(Profile* profile)
     : profile_(profile),
-      adapter_(chromeos::BluetoothAdapterFactory::DefaultAdapter()),
+      adapter_(bluetooth::BluetoothAdapterFactory::DefaultAdapter()),
       next_socket_id_(1) {
   DCHECK(profile_);
-  DCHECK(adapter_.get());
-  adapter_->AddObserver(this);
+  if (adapter_.get()) {

[bryeung, 2012/10/10 15:03:53]

no braces

[youngki, 2012/10/10 18:34:57]

Done.

+    adapter_->AddObserver(this);
+  }
 }
 
 ExtensionBluetoothEventRouter::~ExtensionBluetoothEventRouter() {
-  adapter_->RemoveObserver(this);
+  if (adapter_.get()) {

[bryeung, 2012/10/10 15:03:53]

no braces

[youngki, 2012/10/10 18:34:57]

Done.

+    adapter_->RemoveObserver(this);
+  }
   socket_map_.clear();
 }
 
@@ -102,7 +107,7 @@ void ExtensionBluetoothEventRouter::DispatchDeviceEvent(
 }
 
 void ExtensionBluetoothEventRouter::AdapterPresentChanged(
-    chromeos::BluetoothAdapter* adapter, bool present) {
+    bluetooth::BluetoothAdapter* adapter, bool present) {
   if (adapter != adapter_.get()) {
     DVLOG(1) << "Ignoring event for adapter " << adapter->address();
     return;
@@ -114,7 +119,7 @@ void ExtensionBluetoothEventRouter::AdapterPresentChanged(
 }
 
 void ExtensionBluetoothEventRouter::AdapterPoweredChanged(
-    chromeos::BluetoothAdapter* adapter, bool has_power) {
+    bluetooth::BluetoothAdapter* adapter, bool has_power) {
   if (adapter != adapter_.get()) {
     DVLOG(1) << "Ignoring event for adapter " << adapter->address();
     return;
@@ -126,7 +131,7 @@ void ExtensionBluetoothEventRouter::AdapterPoweredChanged(
 }
 
 void ExtensionBluetoothEventRouter::AdapterDiscoveringChanged(
-    chromeos::BluetoothAdapter* adapter, bool discovering) {
+    bluetooth::BluetoothAdapter* adapter, bool discovering) {
   if (adapter != adapter_.get()) {
     DVLOG(1) << "Ignoring event for adapter " << adapter->address();
     return;
@@ -144,7 +149,8 @@ void ExtensionBluetoothEventRouter::AdapterDiscoveringChanged(
 }
 
 void ExtensionBluetoothEventRouter::DeviceAdded(
-    chromeos::BluetoothAdapter* adapter, chromeos::BluetoothDevice* device) {
+    bluetooth::BluetoothAdapter* adapter,
+    bluetooth::BluetoothDevice* device) {
   if (adapter != adapter_.get()) {
     DVLOG(1) << "Ignoring event for adapter " << adapter->address();
     return;
@@ -170,4 +176,4 @@ void ExtensionBluetoothEventRouter::DispatchBooleanValueEvent(
       event_name, args.Pass(), NULL, GURL());
 }
 
-}  // namespace chromeos
+}  // namespace extensions