Moved bluetooth adapter files to device/bluetooth/.

device/bluetooth/bluetooth_device_chromeos.h

Index: device/bluetooth/bluetooth_device_chromeos.h
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.h b/device/bluetooth/bluetooth_device_chromeos.h
similarity index 95%
rename from chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.h
rename to device/bluetooth/bluetooth_device_chromeos.h
index a4202c5dd348ae1eafb8e4c1ebb884d9244ca8ee..a771d69258d8a44fddb6e6c8ebddc2b920bedc53 100644
--- a/chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.h
+++ b/device/bluetooth/bluetooth_device_chromeos.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H_
-#define CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H_
+#ifndef DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H_
+#define DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H_
 
 #include <string>
 #include <vector>
@@ -13,12 +13,12 @@
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
 #include "chromeos/dbus/bluetooth_agent_service_provider.h"
 #include "chromeos/dbus/bluetooth_device_client.h"
 #include "dbus/object_path.h"
+#include "device/bluetooth/bluetooth_device.h"
 
-namespace chromeos {
+namespace bluetooth {

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

namespace?

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

Done.

 
 class BluetoothAdapterChromeOs;
 class BluetoothServiceRecord;
@@ -27,9 +27,10 @@ struct BluetoothOutOfBandPairingData;
 
 // The BluetoothDeviceChromeOs class is an implementation of BluetoothDevice
 // for Chrome OS platform.
-class BluetoothDeviceChromeOs : public BluetoothDevice,
-                                public BluetoothDeviceClient::Observer,
-                                public BluetoothAgentServiceProvider::Delegate {
+class BluetoothDeviceChromeOs
+    : public BluetoothDevice,
+      public chromeos::BluetoothDeviceClient::Observer,
+      public chromeos::BluetoothAgentServiceProvider::Delegate {
  public:
   virtual ~BluetoothDeviceChromeOs();
 
@@ -63,7 +64,7 @@ class BluetoothDeviceChromeOs : public BluetoothDevice,
       const std::string& service_uuid,
       const SocketCallback& callback) OVERRIDE;
   virtual void SetOutOfBandPairingData(
-      const chromeos::BluetoothOutOfBandPairingData& data,
+      const bluetooth::BluetoothOutOfBandPairingData& data,
       const base::Closure& callback,
       const ErrorCallback& error_callback) OVERRIDE;
   virtual void ClearOutOfBandPairingData(
@@ -90,7 +91,7 @@ class BluetoothDeviceChromeOs : public BluetoothDevice,
   // Updates device information from the properties in |properties|, device
   // state properties such as |paired_| and |connected_| are ignored unless
   // |update_state| is true.
-  void Update(const BluetoothDeviceClient::Properties* properties,
+  void Update(const chromeos::BluetoothDeviceClient::Properties* properties,
               bool update_state);
 
   // Called by BluetoothAdapterClient when a call to CreateDevice() or
@@ -116,7 +117,7 @@ class BluetoothDeviceChromeOs : public BluetoothDevice,
       const ServiceRecordsCallback& callback,
       const ErrorCallback& error_callback,
       const dbus::ObjectPath& device_path,
-      const BluetoothDeviceClient::ServiceMap& service_map,
+      const chromeos::BluetoothDeviceClient::ServiceMap& service_map,
       bool success);
 
   // Called by BluetoothProperty when the call to Set() for the Trusted
@@ -345,7 +346,7 @@ class BluetoothDeviceChromeOs : public BluetoothDevice,
 
   // During pairing this is set to an instance of a D-Bus agent object
   // intialized with our own class as its delegate.
-  scoped_ptr<BluetoothAgentServiceProvider> agent_;
+  scoped_ptr<chromeos::BluetoothAgentServiceProvider> agent_;
 
   // During pairing these callbacks are set to those provided by method calls
   // made on us by |agent_| and are called by our own method calls such as
@@ -364,6 +365,6 @@ class BluetoothDeviceChromeOs : public BluetoothDevice,
   DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceChromeOs);
 };
 
-}  // namespace chromeos
+}  // namespace bluetooth
 
-#endif  // CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H_
+#endif  // DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H_