Moved bluetooth adapter files to device/bluetooth/.

device/bluetooth/bluetooth_device_chromeos.cc

Index: device/bluetooth/bluetooth_device_chromeos.cc
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.cc b/device/bluetooth/bluetooth_device_chromeos.cc
similarity index 96%
rename from chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.cc
rename to device/bluetooth/bluetooth_device_chromeos.cc
index aa060d5d011db666f892db523f06a173cfedddfb..d2204bac9c8c5a03ff48697de787bd6a95aaa673 100644
--- a/chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.cc
+++ b/device/bluetooth/bluetooth_device_chromeos.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/bluetooth/bluetooth_device_chromeos.h"
+#include "device/bluetooth/bluetooth_device_chromeos.h"
 
 #include <map>
 #include <string>
@@ -16,23 +16,26 @@
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_service_record.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_socket_chromeos.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_utils.h"
 #include "chromeos/dbus/bluetooth_adapter_client.h"
 #include "chromeos/dbus/bluetooth_agent_service_provider.h"
 #include "chromeos/dbus/bluetooth_device_client.h"
 #include "chromeos/dbus/bluetooth_input_client.h"
 #include "chromeos/dbus/bluetooth_out_of_band_client.h"
-#include "chromeos/dbus/bluetooth_out_of_band_pairing_data.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/introspectable_client.h"
 #include "dbus/bus.h"
 #include "dbus/object_path.h"
+#include "device/bluetooth/bluetooth_adapter_chromeos.h"
+#include "device/bluetooth/bluetooth_out_of_band_pairing_data.h"
+#include "device/bluetooth/bluetooth_service_record.h"
+#include "device/bluetooth/bluetooth_socket_chromeos.h"
+#include "device/bluetooth/bluetooth_utils.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
-namespace chromeos {
+using chromeos::BluetoothDeviceClient;
+using chromeos::DBusThreadManager;
+
+namespace bluetooth {

[keybuk, 2012/10/12 00:13:18]

namespace?

again pick either explicit chromeos:: or using everywhere - don't mix

[youngki, 2012/10/12 01:50:12]

Done.

 
 BluetoothDeviceChromeOs::BluetoothDeviceChromeOs(
     BluetoothAdapterChromeOs* adapter)
@@ -74,7 +77,7 @@ bool BluetoothDeviceChromeOs::ProvidesServiceWithUUID(
   for (BluetoothDevice::ServiceList::const_iterator iter = services.begin();
        iter != services.end();
        ++iter) {
-    if (bluetooth_utils::CanonicalUuid(*iter) == uuid)
+    if (utils::CanonicalUuid(*iter) == uuid)
       return true;
   }
   return false;
@@ -141,9 +144,9 @@ void BluetoothDeviceChromeOs::Connect(PairingDelegate* pairing_delegate,
 
     dbus::Bus* system_bus = DBusThreadManager::Get()->GetSystemBus();
     if (system_bus) {
-      agent_.reset(BluetoothAgentServiceProvider::Create(system_bus,
-                                                         agent_path,
-                                                         this));
+      agent_.reset(chromeos::BluetoothAgentServiceProvider::Create(system_bus,
+                                                                   agent_path,
+                                                                   this));
     } else {
       agent_.reset(NULL);
     }
@@ -259,7 +262,7 @@ void BluetoothDeviceChromeOs::ConnectToService(const std::string& service_uuid,
 }
 
 void BluetoothDeviceChromeOs::SetOutOfBandPairingData(
-    const chromeos::BluetoothOutOfBandPairingData& data,
+    const bluetooth::BluetoothOutOfBandPairingData& data,
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
   DBusThreadManager::Get()->GetBluetoothOutOfBandClient()->
@@ -425,7 +428,8 @@ void BluetoothDeviceChromeOs::OnIntrospect(const base::Closure& callback,
   // device. Send appropraite Connect calls for each of those interfaces
   // to connect all of the application protocols for this device.
   std::vector<std::string> interfaces =
-      IntrospectableClient::GetInterfacesFromIntrospectResult(xml_data);
+      chromeos::IntrospectableClient::GetInterfacesFromIntrospectResult(
+          xml_data);
 
   DCHECK_EQ(0, connecting_applications_counter_);
   connecting_applications_counter_ = 0;
@@ -682,4 +686,4 @@ BluetoothDeviceChromeOs* BluetoothDeviceChromeOs::Create(
   return new BluetoothDeviceChromeOs(adapter);
 }
 
-}  // namespace chromeos
+}  // namespace bluetooth