bluetooth: Standardize Bluetooth adapter access in Adapter service.

device/bluetooth/adapter.cc

Index: device/bluetooth/adapter.cc
diff --git a/device/bluetooth/adapter.cc b/device/bluetooth/adapter.cc
index 2f7aff0be4c195e18a1570e55852ea00b95a5268..ed33dcd3555dcbe58aa8908aaf59cecfc4136489 100644
--- a/device/bluetooth/adapter.cc
+++ b/device/bluetooth/adapter.cc
@@ -9,40 +9,39 @@
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "device/bluetooth/adapter.h"
-#include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace bluetooth {
 
-Adapter::Adapter() : client_(nullptr), weak_ptr_factory_(this) {}
+Adapter::Adapter(scoped_refptr<device::BluetoothAdapter> adapter,
+                 mojom::AdapterClientPtr client)
+    : adapter_(adapter), client_(std::move(client)), weak_ptr_factory_(this) {
+  adapter_->AddObserver(this);
+}
 
 Adapter::~Adapter() {
-  if (adapter_) {
-    adapter_->RemoveObserver(this);
-    adapter_ = nullptr;
-  }
+  adapter_->RemoveObserver(this);
+  adapter_ = nullptr;
 }
 
 // static
-void Adapter::Create(mojom::AdapterRequest request) {
-  mojo::MakeStrongBinding(base::MakeUnique<Adapter>(), std::move(request));
+void Adapter::Create(mojom::AdapterRequest request,
+                     mojom::AdapterClientPtr client,
+                     scoped_refptr<device::BluetoothAdapter> adapter) {
+  mojo::MakeStrongBinding(base::MakeUnique<Adapter>(adapter, std::move(client)),

[ortuno, 2016/10/05 02:07:51]

If you decide to use the interface I proposed you would to the following here:

mojom::AdapterPtr adapter_ptr;
mojo::MakeStrongBinding(base::MakeUnique<Adapter>(adapter),
                        mojo::GetProxy(&adapter_ptr));

return adapter_ptr; // callback.Run(adapter_ptr); if you move this to
adapter_factory.

[mbrunson, 2016/10/05 17:59:04]

Done.

+                          std::move(request));
 }
 
 void Adapter::GetDevices(const GetDevicesCallback& callback) {
-  if (!adapter_) {
-    if (device::BluetoothAdapterFactory::IsBluetoothAdapterAvailable()) {
-      base::Closure c = base::Bind(&Adapter::GetDevicesImpl,
-                                   weak_ptr_factory_.GetWeakPtr(), callback);
-
-      device::BluetoothAdapterFactory::GetAdapter(base::Bind(
-          &Adapter::OnGetAdapter, weak_ptr_factory_.GetWeakPtr(), c));
-      return;
-    }
-    callback.Run(std::vector<mojom::DeviceInfoPtr>());
-    return;
+  std::vector<mojom::DeviceInfoPtr> devices;
+
+  for (const device::BluetoothDevice* device : adapter_->GetDevices()) {
+    mojom::DeviceInfoPtr device_info = ConstructDeviceInfoStruct(device);
+    devices.push_back(std::move(device_info));
   }
-  GetDevicesImpl(callback);
+
+  callback.Run(std::move(devices));
 }
 
 void Adapter::SetClient(mojom::AdapterClientPtr client) {
@@ -65,8 +64,9 @@ void Adapter::DeviceRemoved(device::BluetoothAdapter* adapter,
   }
 }
 
+// static
 mojom::DeviceInfoPtr Adapter::ConstructDeviceInfoStruct(
-    const device::BluetoothDevice* device) const {
+    const device::BluetoothDevice* const device) {
   mojom::DeviceInfoPtr device_info = mojom::DeviceInfo::New();
 
   device_info->name = device->GetName();
@@ -78,25 +78,4 @@ mojom::DeviceInfoPtr Adapter::ConstructDeviceInfoStruct(
   return device_info;
 }
 
-void Adapter::GetDevicesImpl(const GetDevicesCallback& callback) {
-  std::vector<mojom::DeviceInfoPtr> devices;
-
-  for (const device::BluetoothDevice* device : adapter_->GetDevices()) {
-    mojom::DeviceInfoPtr device_info = ConstructDeviceInfoStruct(device);
-    devices.push_back(std::move(device_info));
-  }
-
-  callback.Run(std::move(devices));
-}
-
-void Adapter::OnGetAdapter(const base::Closure& continuation,
-                           scoped_refptr<device::BluetoothAdapter> adapter) {
-  if (!adapter_) {
-    VLOG(1) << "Adapter acquired";
-    adapter_ = adapter;
-    adapter_->AddObserver(this);
-  }
-  continuation.Run();
-}
-
 }  // namespace bluetooth