Moved bluetooth adapter files to device/bluetooth/.

device/bluetooth/bluetooth_adapter_chromeos.h

 // 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.
 
-#ifndef CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_
-#define CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_
+#ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_
+#define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/observer_list.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
 #include "chromeos/dbus/bluetooth_adapter_client.h"
 #include "chromeos/dbus/bluetooth_device_client.h"
 #include "chromeos/dbus/bluetooth_manager_client.h"
 #include "dbus/object_path.h"
+#include "device/bluetooth/bluetooth_adapter.h"
 
-namespace chromeos {
+namespace bluetooth {

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

should this namespace change? this is still chromeos specific code

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

Done.

 
 class BluetoothDeviceChromeOs;
 
 struct BluetoothOutOfBandPairingData;
 
 // The BluetoothAdapterChromeOs class is an implementation of BluetoothAdapter
 // for Chrome OS platform.
-class BluetoothAdapterChromeOs : public BluetoothAdapter,
-                                 public BluetoothManagerClient::Observer,
-                                 public BluetoothAdapterClient::Observer,
-                                 public BluetoothDeviceClient::Observer {
+class BluetoothAdapterChromeOs
+    : public BluetoothAdapter,
+      public chromeos::BluetoothManagerClient::Observer,
+      public chromeos::BluetoothAdapterClient::Observer,
+      public chromeos::BluetoothDeviceClient::Observer {
  public:
   // BluetoothAdapter override
   virtual void AddObserver(BluetoothAdapter::Observer* observer) OVERRIDE;
   virtual void RemoveObserver(BluetoothAdapter::Observer* observer) OVERRIDE;
   virtual bool IsPresent() const OVERRIDE;
   virtual bool IsPowered() const OVERRIDE;
   virtual void SetPowered(
       bool powered,
       const base::Closure& callback,
       const ErrorCallback& error_callback) OVERRIDE;
@@ skipping 139 matching lines @@
   //
   // Called when the adapter with object path |object_path| discovers
   // a new remote device with address |address| and properties
   // |properties|, there is no device object path until connected.
   //
   // |properties| supports only value() calls, not Get() or Set(), and
   // should be copied if needed.
   virtual void DeviceFound(
         const dbus::ObjectPath& adapter_path,
         const std::string& address,
-        const BluetoothDeviceClient::Properties& properties) OVERRIDE;
+        const chromeos::BluetoothDeviceClient::Properties& properties) OVERRIDE;
 
   // BluetoothAdapterClient::Observer override.
   //
   // Called when the adapter with object path |object_path| can no
   // longer communicate with the discovered removed device with
   // address |address|.
   virtual void DeviceDisappeared(const dbus::ObjectPath& object_path,
                                  const std::string& address) OVERRIDE;
 
   // List of observers interested in event notifications from us.
@@ skipping 17 matching lines @@
   typedef std::map<const std::string, BluetoothDeviceChromeOs*> DevicesMap;
   DevicesMap devices_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BluetoothAdapterChromeOs> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterChromeOs);
 };
 
-}  // namespace chromeos
+}  // namespace bluetooth
 
-#endif  // CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_
+#endif  // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_