bluetooth: Standardize Bluetooth adapter access in Adapter service.

device/bluetooth/adapter.h

Index: device/bluetooth/adapter.h
diff --git a/device/bluetooth/adapter.h b/device/bluetooth/adapter.h
index e6e03940e0c504c2983e77c655bc2e442ecef65f..bde7e36a093e20f8cdb5925a6849405f2e0dd356 100644
--- a/device/bluetooth/adapter.h
+++ b/device/bluetooth/adapter.h
@@ -7,23 +7,21 @@
 
 #include "base/macros.h"
 #include "device/bluetooth/bluetooth_adapter.h"
+#include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/public/interfaces/adapter.mojom.h"
 
 namespace bluetooth {
 
-// Implementation of Mojo BluetoothAdapter located in
-// device/bluetooth/public/interfaces/bluetooth.mojom.
+// Implementation of Mojo Adapter located in
+// device/bluetooth/public/interfaces/adapter.mojom.
 // It handles requests for Bluetooth adapter capabilities
 // and devices and uses the platform abstraction of device/bluetooth.
 class Adapter : public mojom::Adapter,
                 public device::BluetoothAdapter::Observer {
  public:
-  Adapter();
+  explicit Adapter(scoped_refptr<device::BluetoothAdapter> adapter);
   ~Adapter() override;
 
-  // Creates an Adapter with a strong Mojo binding to |request|
-  static void Create(mojom::AdapterRequest request);
-
   // mojom::Adapter overrides:
   void GetDevices(const GetDevicesCallback& callback) override;
   void SetClient(mojom::AdapterClientPtr client) override;
@@ -35,13 +33,10 @@ class Adapter : public mojom::Adapter,
                      device::BluetoothDevice* device) override;
 
  private:
-  mojom::DeviceInfoPtr ConstructDeviceInfoStruct(
-      const device::BluetoothDevice* device) const;
-
-  void GetDevicesImpl(const GetDevicesCallback& callback);
+  // Creates a mojom::DeviceInfo using info from the given |device|.
+  static mojom::DeviceInfoPtr ConstructDeviceInfoStruct(

[ortuno, 2016/10/05 22:21:44]

unrelated comment: I don't think this needs to be a private method. You could
just put it in an anonymous namespace in the cc file. No need to do it in this
patch, just something to keep in mind if you are doing some clean up.

[mbrunson, 2016/10/05 22:30:41]

In the next set of patches I've moved this to the LEDevice service since it
directly relates to that.

+      const device::BluetoothDevice* const device);
 
-  void OnGetAdapter(const base::Closure& continuation,
-                    scoped_refptr<device::BluetoothAdapter> adapter);
   // The current Bluetooth adapter.
   scoped_refptr<device::BluetoothAdapter> adapter_;