Moved bluetooth adapter files to device/bluetooth/.

chrome/browser/extensions/bluetooth_event_router.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/chromeos/extensions/bluetooth_event_router.h"
+#include "chrome/browser/extensions/bluetooth_event_router.h"
 
 #include <map>
 
 #include "base/json/json_writer.h"
 #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();
 }
 
 int ExtensionBluetoothEventRouter::RegisterSocket(
     scoped_refptr<BluetoothSocket> socket) {
   // If there is a socket registered with the same fd, just return it's id
   for (SocketMap::const_iterator i = socket_map_.begin();
       i != socket_map_.end(); ++i) {
     if (i->second->fd() == socket->fd()) {
       return i->first;
@@ skipping 48 matching lines @@
   scoped_ptr<ListValue> args(new ListValue());
   args->Append(device.ToValue().release());
   profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
       event_name,
       args.Pass(),
       NULL,
       GURL());
 }
 
 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;
   }
 
   DispatchBooleanValueEvent(
       extensions::event_names::kBluetoothOnAvailabilityChanged,
       present);
 }
 
 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;
   }
 
   DispatchBooleanValueEvent(
       extensions::event_names::kBluetoothOnPowerChanged,
       has_power);
 }
 
 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;
   }
 
   if (!discovering) {
     send_discovery_events_ = false;
     responsible_for_discovery_ = false;
     discovered_devices_.clear();
   }
 
   DispatchBooleanValueEvent(
       extensions::event_names::kBluetoothOnDiscoveringChanged,
       discovering);
 }
 
 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;
   }
 
   experimental_bluetooth::Device* extension_device =
       new experimental_bluetooth::Device();
   experimental_bluetooth::BluetoothDeviceToApiDevice(*device, extension_device);
   discovered_devices_.push_back(extension_device);
 
   if (!send_discovery_events_)
     return;
 
   DispatchDeviceEvent(extensions::event_names::kBluetoothOnDeviceDiscovered,
                       *extension_device);
 }
 
 void ExtensionBluetoothEventRouter::DispatchBooleanValueEvent(
     const char* event_name, bool value) {
   scoped_ptr<ListValue> args(new ListValue());
   args->Append(Value::CreateBooleanValue(value));
   profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
       event_name, args.Pass(), NULL, GURL());
 }
 
-}  // namespace chromeos
+}  // namespace extensions