bluetooth: Add Device connection logic and accompanying user interface.

device/bluetooth/device.cc

Index: device/bluetooth/device.cc
diff --git a/device/bluetooth/device.cc b/device/bluetooth/device.cc
index 7e662802eabb5aed91c9859f782903049c866170..dbecb98f3c78d3f96f0b7545ab6e7b2065fa8c67 100644
--- a/device/bluetooth/device.cc
+++ b/device/bluetooth/device.cc
@@ -3,18 +3,32 @@
 // found in the LICENSE file.
 
 #include <utility>
+#include <vector>
 
 #include "base/strings/utf_string_conversions.h"
 #include "device/bluetooth/device.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace bluetooth {
+Device::Device(scoped_refptr<device::BluetoothAdapter> adapter,
+               std::unique_ptr<device::BluetoothGattConnection> connection)
+    : adapter_(std::move(adapter)), connection_(std::move(connection)) {
+  adapter_->AddObserver(this);
+}
 
-Device::Device(const std::string& address,
-               scoped_refptr<device::BluetoothAdapter> adapter)
-    : address_(address), adapter_(std::move(adapter)) {}
+Device::~Device() {
+  adapter_->RemoveObserver(this);
+}
 
-Device::~Device() {}
+// static
+void Device::Create(scoped_refptr<device::BluetoothAdapter> adapter,
+                    std::unique_ptr<device::BluetoothGattConnection> connection,
+                    mojom::DeviceRequest request) {
+  auto* deviceImpl = new Device(adapter, std::move(connection));

[dcheng, 2016/11/17 01:31:47]

Nit: device_impl

[mbrunson, 2016/11/17 03:34:43]

Done.

+  auto binding =
+      mojo::MakeStrongBinding(base::WrapUnique(deviceImpl), std::move(request));
+  deviceImpl->binding_ = binding;
+}
 
 // static
 mojom::DeviceInfoPtr Device::ConstructDeviceInfoStruct(
@@ -25,6 +39,7 @@ mojom::DeviceInfoPtr Device::ConstructDeviceInfoStruct(
   device_info->name_for_display =
       base::UTF16ToUTF8(device->GetNameForDisplay());
   device_info->address = device->GetAddress();
+  device_info->is_gatt_connected = device->IsGattConnected();
 
   if (device->GetInquiryRSSI()) {
     device_info->rssi = mojom::RSSIWrapper::New();
@@ -34,14 +49,84 @@ mojom::DeviceInfoPtr Device::ConstructDeviceInfoStruct(
   return device_info;
 }
 
+void Device::DeviceChanged(device::BluetoothAdapter* adapter,
+                           device::BluetoothDevice* device) {
+  if (device->GetAddress() != GetAddress()) {
+    return;
+  }
+
+  if (!device->IsGattConnected()) {
+    binding_->Close();
+  }
+}
+
+void Device::GattServicesDiscovered(device::BluetoothAdapter* adapter,
+                                    device::BluetoothDevice* device) {
+  if (device->GetAddress() != GetAddress()) {
+    return;
+  }
+
+  std::vector<base::Closure> requests;
+  requests.swap(pending_services_requests_);
+  for (const base::Closure& request : requests) {
+    request.Run();
+  }
+}
+
+void Device::Disconnect() {
+  binding_->Close();
+}
+
 void Device::GetInfo(const GetInfoCallback& callback) {
-  device::BluetoothDevice* device = adapter_->GetDevice(address_);
-  if (device) {
-    mojom::DeviceInfoPtr device_info = ConstructDeviceInfoStruct(device);
-    callback.Run(std::move(device_info));
-  } else {
-    callback.Run(nullptr);
+  device::BluetoothDevice* device = adapter_->GetDevice(GetAddress());
+  DCHECK(device);
+
+  mojom::DeviceInfoPtr device_info = ConstructDeviceInfoStruct(device);
+  callback.Run(std::move(device_info));

[dcheng, 2016/11/17 01:31:47]

Optional: both line 85 and line 112 would be slightly shorter if we just
directly use the result of ConstructDeviceInfoStruct() rather than saving it
into a local first.

[mbrunson, 2016/11/17 03:34:43]

Done.

+}
+
+void Device::GetServices(const GetServicesCallback& callback) {
+  device::BluetoothDevice* device = adapter_->GetDevice(GetAddress());
+  DCHECK(device);
+
+  if (device->IsGattServicesDiscoveryComplete()) {
+    GetServicesImpl(callback);
+    return;
+  }
+
+  // pending_services_requests_ is owned by Device, so base::Unretained is
+  // safe.
+  pending_services_requests_.push_back(
+      base::Bind(&Device::GetServicesImpl, base::Unretained(this), callback));
+}
+
+void Device::GetServicesImpl(const GetServicesCallback& callback) {
+  device::BluetoothDevice* device = adapter_->GetDevice(GetAddress());
+  DCHECK(device);
+
+  std::vector<mojom::ServiceInfoPtr> services;
+
+  for (const device::BluetoothRemoteGattService* service :
+       device->GetGattServices()) {
+    mojom::ServiceInfoPtr service_info = ConstructServiceInfoStruct(*service);
+    services.push_back(std::move(service_info));
   }
+
+  callback.Run(std::move(services));
+}
+
+mojom::ServiceInfoPtr Device::ConstructServiceInfoStruct(
+    const device::BluetoothRemoteGattService& service) {
+  mojom::ServiceInfoPtr service_info = mojom::ServiceInfo::New();
+
+  service_info->uuid = service.GetUUID();
+  service_info->is_primary = service.IsPrimary();
+
+  return service_info;
+}
+
+const std::string& Device::GetAddress() {
+  return connection_->GetDeviceAddress();
 }
 
 }  // namespace bluetooth