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..6b6d966083c4932ecd182335c2fb51e8428226ae 100644
--- a/device/bluetooth/device.cc
+++ b/device/bluetooth/device.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include <utility>
+#include <vector>
 
 #include "base/strings/utf_string_conversions.h"
 #include "device/bluetooth/device.h"
@@ -10,9 +11,9 @@
 
 namespace bluetooth {
 
-Device::Device(const std::string& address,
-               scoped_refptr<device::BluetoothAdapter> adapter)
-    : address_(address), adapter_(std::move(adapter)) {}
+Device::Device(scoped_refptr<device::BluetoothAdapter> adapter,
+               std::unique_ptr<device::BluetoothGattConnection> connection)
+    : adapter_(std::move(adapter)), connection_(std::move(connection)) {}
 
 Device::~Device() {}
 
@@ -25,6 +26,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();
@@ -35,7 +37,8 @@ mojom::DeviceInfoPtr Device::ConstructDeviceInfoStruct(
 }
 
 void Device::GetInfo(const GetInfoCallback& callback) {
-  device::BluetoothDevice* device = adapter_->GetDevice(address_);
+  device::BluetoothDevice* device =
+      adapter_->GetDevice(connection_->GetDeviceAddress());

[ortuno, 2016/10/26 02:52:21]

nit: Add a GetAddress() helper to avoid writing this every time.

[mbrunson, 2016/10/28 21:06:47]

Done.

   if (device) {
     mojom::DeviceInfoPtr device_info = ConstructDeviceInfoStruct(device);
     callback.Run(std::move(device_info));
@@ -44,4 +47,30 @@ void Device::GetInfo(const GetInfoCallback& callback) {
   }
 }
 
+void Device::GetServices(const GetServicesCallback& callback) {
+  device::BluetoothDevice* device =
+      adapter_->GetDevice(connection_->GetDeviceAddress());
+  std::vector<mojom::ServiceInfoPtr> services;
+
+  if (device) {
+    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;
+}
+
 }  // namespace bluetooth