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 device {
+
+class BluetoothAdapterFactory;
+class MockBluetoothAdapter;
+struct BluetoothOutOfBandPairingData;
+
+}  // namespace device
 
 namespace chromeos {
 
 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

[tfarina, 2012/10/20 02:08:42]

This class should have probably be named BluetoothAdapterChromeOS,
it's Operating System, not Operating system ;)

Notice that the comment about writes 'Chrome OS'.

And the numbers don't lie:

$ g gs ChromeOS | wc -l
1001

$ g gs ChromeOs | wc -l
324

+    : public device::BluetoothAdapter,
+      public BluetoothManagerClient::Observer,
+      public BluetoothAdapterClient::Observer,
+      public BluetoothDeviceClient::Observer {
  public:
   // BluetoothAdapter override
-  virtual void AddObserver(BluetoothAdapter::Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(BluetoothAdapter::Observer* observer) OVERRIDE;
+  virtual void AddObserver(
+      device::BluetoothAdapter::Observer* observer) OVERRIDE;
+  virtual void RemoveObserver(
+      device::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;
   virtual bool IsDiscovering() const OVERRIDE;
   virtual void SetDiscovering(
       bool discovering,
       const base::Closure& callback,
       const ErrorCallback& error_callback) OVERRIDE;
   virtual ConstDeviceList GetDevices() const OVERRIDE;
-  virtual BluetoothDevice* GetDevice(const std::string& address) OVERRIDE;
-  virtual const BluetoothDevice* GetDevice(
+  virtual device::BluetoothDevice* GetDevice(
+      const std::string& address) OVERRIDE;
+  virtual const device::BluetoothDevice* GetDevice(
       const std::string& address) const OVERRIDE;
   virtual void ReadLocalOutOfBandPairingData(
-      const BluetoothOutOfBandPairingDataCallback& callback,
+      const device::BluetoothAdapter::BluetoothOutOfBandPairingDataCallback&
+          callback,
       const ErrorCallback& error_callback) OVERRIDE;
 
  private:
-  friend class BluetoothAdapterFactory;
   friend class BluetoothDeviceChromeOs;
-  friend class MockBluetoothAdapter;
+  friend class device::BluetoothAdapterFactory;
+  friend class device::MockBluetoothAdapter;
 
   BluetoothAdapterChromeOs();
   virtual ~BluetoothAdapterChromeOs();
 
   // Obtains the default adapter object path from the Bluetooth Daemon
   // and tracks future changes to it.
   void TrackDefaultAdapter();
 
   // Obtains the object paht for the adapter named by |address| from the
   // Bluetooth Daemon.
@@ skipping 48 matching lines @@
                        const ErrorCallback& error_callback,
                        const dbus::ObjectPath& adapter_path,
                        bool success);
 
   // Updates the tracked state of the adapter's discovering state to
   // |discovering| and notifies observers. Called on receipt of a property
   // changed signal, and directly using values obtained from properties.
   void DiscoveringChanged(bool discovering);
 
   // Called by dbus:: in response to the ReadLocalData method call.
-  void OnReadLocalData(const BluetoothOutOfBandPairingDataCallback& callback,
-                       const ErrorCallback& error_callback,
-                       const BluetoothOutOfBandPairingData& data,
-                       bool success);
+  void OnReadLocalData(
+      const device::BluetoothAdapter::BluetoothOutOfBandPairingDataCallback&
+          callback,
+      const ErrorCallback& error_callback,
+      const device::BluetoothOutOfBandPairingData& data,
+      bool success);
 
   // BluetoothAdapterClient::Observer override.
   //
   // Called when the adapter with object path |adapter_path| has a
   // change in value of the property named |property_name|.
   virtual void AdapterPropertyChanged(const dbus::ObjectPath& adapter_path,
                                       const std::string& property_name)
       OVERRIDE;
 
   // BluetoothDeviceClient::Observer override.
@@ skipping 51 matching lines @@
 
   // 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.
-  ObserverList<BluetoothAdapter::Observer> observers_;
+  ObserverList<device::BluetoothAdapter::Observer> observers_;
 
   // Object path of adapter for this instance, this is fixed at creation time
   // unless |track_default_| is true in which case we update it to always
   // point at the default adapter.
   bool track_default_;
   dbus::ObjectPath object_path_;
 
   // Tracked adapter state, cached locally so we only send change notifications
   // to observers on a genuine change.
   bool powered_;
   bool discovering_;
 
   // Devices paired with, connected to, discovered by, or visible to the
   // adapter. The key is the Bluetooth address of the device and the value
   // is the BluetoothDeviceChromeOs object whose lifetime is managed by the
   // adapter instance.
   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
 
-#endif  // CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_
+#endif  // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_