bluetooth: Add Device connection logic and accompanying user interface.

device/bluetooth/adapter.cc

 // Copyright 2016 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.
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "device/bluetooth/adapter.h"
 #include "device/bluetooth/device.h"
@@ skipping 16 matching lines @@
   adapter_info->address = adapter_->GetAddress();
   adapter_info->name = adapter_->GetName();
   adapter_info->initialized = adapter_->IsInitialized();
   adapter_info->present = adapter_->IsPresent();
   adapter_info->powered = adapter_->IsPowered();
   adapter_info->discoverable = adapter_->IsDiscoverable();
   adapter_info->discovering = adapter_->IsDiscovering();
   callback.Run(std::move(adapter_info));
 }
 
-void Adapter::GetDevice(const std::string& address,
-                        const GetDeviceCallback& callback) {
-  mojom::DevicePtr device_ptr;
-  mojo::MakeStrongBinding(base::MakeUnique<Device>(address, adapter_),
-                          mojo::GetProxy(&device_ptr));
-  callback.Run(std::move(device_ptr));
+void Adapter::ConnectToDevice(const std::string& address,
+                              const ConnectToDeviceCallback& callback) {
+  device::BluetoothDevice* device = adapter_->GetDevice(address);
+
+  if (!device) {
+    callback.Run(mojom::ConnectErrorCode::DEVICE_NO_LONGER_IN_RANGE,
+                 nullptr /* Device */);

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

nit: s/Device/device/

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

Done.

+    return;
+  }
+
+  device->CreateGattConnection(
+      base::Bind(&Adapter::OnGattConnected, weak_ptr_factory_.GetWeakPtr(),
+                 callback),
+      base::Bind(&Adapter::OnConnectError, weak_ptr_factory_.GetWeakPtr(),
+                 callback));
 }
 
 void Adapter::GetDevices(const GetDevicesCallback& callback) {
   std::vector<mojom::DeviceInfoPtr> devices;
 
   for (const device::BluetoothDevice* device : adapter_->GetDevices()) {
     mojom::DeviceInfoPtr device_info =
         Device::ConstructDeviceInfoStruct(device);
     devices.push_back(std::move(device_info));
   }
@@ skipping 22 matching lines @@
 }
 
 void Adapter::DeviceChanged(device::BluetoothAdapter* adapter,
                             device::BluetoothDevice* device) {
   if (client_) {
     auto device_info = Device::ConstructDeviceInfoStruct(device);
     client_->DeviceChanged(std::move(device_info));
   }
 }
 
+void Adapter::OnGattConnected(
+    const ConnectToDeviceCallback& callback,
+    std::unique_ptr<device::BluetoothGattConnection> connection) {
+  mojom::DevicePtr device_ptr;
+  mojo::MakeStrongBinding(
+      base::MakeUnique<Device>(adapter_, std::move(connection)),
+      mojo::GetProxy(&device_ptr));
+  callback.Run(mojom::ConnectErrorCode::SUCCESS, std::move(device_ptr));
+}
+
+void Adapter::OnConnectError(
+    const ConnectToDeviceCallback& callback,
+    device::BluetoothDevice::ConnectErrorCode error_code) {
+  mojom::ConnectErrorCode code = BluetoothErrorCodeToMojomErrorCode(error_code);
+  callback.Run(code, nullptr /* Device */);
+}
+
+mojom::ConnectErrorCode Adapter::BluetoothErrorCodeToMojomErrorCode(
+    device::BluetoothDevice::ConnectErrorCode error_code) {
+  switch (error_code) {
+    case device::BluetoothDevice::ConnectErrorCode::
+        ERROR_ATTRIBUTE_LENGTH_INVALID:
+      return mojom::ConnectErrorCode::ATTRIBUTE_LENGTH_INVALID;
+    case device::BluetoothDevice::ConnectErrorCode::ERROR_AUTH_CANCELED:
+      return mojom::ConnectErrorCode::AUTH_CANCELED;
+    case device::BluetoothDevice::ConnectErrorCode::ERROR_AUTH_FAILED:
+      return mojom::ConnectErrorCode::AUTH_FAILED;
+    case device::BluetoothDevice::ConnectErrorCode::ERROR_AUTH_REJECTED:
+      return mojom::ConnectErrorCode::AUTH_REJECTED;
+    case device::BluetoothDevice::ConnectErrorCode::ERROR_AUTH_TIMEOUT:
+      return mojom::ConnectErrorCode::AUTH_TIMEOUT;
+    case device::BluetoothDevice::ConnectErrorCode::ERROR_CONNECTION_CONGESTED:
+      return mojom::ConnectErrorCode::CONNECTION_CONGESTED;
+    case device::BluetoothDevice::ConnectErrorCode::ERROR_FAILED:
+      return mojom::ConnectErrorCode::FAILED;
+    case device::BluetoothDevice::ConnectErrorCode::ERROR_INPROGRESS:
+      return mojom::ConnectErrorCode::INPROGRESS;
+    case device::BluetoothDevice::ConnectErrorCode::
+        ERROR_INSUFFICIENT_ENCRYPTION:
+      return mojom::ConnectErrorCode::INSUFFICIENT_ENCRYPTION;
+    case device::BluetoothDevice::ConnectErrorCode::ERROR_OFFSET_INVALID:
+      return mojom::ConnectErrorCode::OFFSET_INVALID;
+    case device::BluetoothDevice::ConnectErrorCode::ERROR_READ_NOT_PERMITTED:
+      return mojom::ConnectErrorCode::READ_NOT_PERMITTED;
+    case device::BluetoothDevice::ConnectErrorCode::ERROR_REQUEST_NOT_SUPPORTED:
+      return mojom::ConnectErrorCode::REQUEST_NOT_SUPPORTED;
+    case device::BluetoothDevice::ConnectErrorCode::ERROR_UNKNOWN:
+      return mojom::ConnectErrorCode::UNKNOWN;
+    case device::BluetoothDevice::ConnectErrorCode::ERROR_UNSUPPORTED_DEVICE:
+      return mojom::ConnectErrorCode::UNSUPPORTED_DEVICE;
+    case device::BluetoothDevice::ConnectErrorCode::ERROR_WRITE_NOT_PERMITTED:
+      return mojom::ConnectErrorCode::WRITE_NOT_PERMITTED;
+    case device::BluetoothDevice::ConnectErrorCode::NUM_CONNECT_ERROR_CODES:

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

This is not an actual error :) add a NOTREACHED and return UNKNOWN. Bonus: Add a
new UNTRANSLATED_CONNECT_ERROR_CODE and use that instead.

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

Done.

+      return mojom::ConnectErrorCode::NUM_CONNECT_ERROR_CODES;
+    default:

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

When a new value is added to an enum the compiler will complain if the value is
not handled by a switch statement. This check is skipped if the switch statement
has a 'default' case. Remove the default case and just add a NOTREACHED followed
by a return, similar to what WebBluetooth does:

https://cs.chromium.org/chromium/src/content/browser/bluetooth/web_bluetooth_...

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

Done.

+      return mojom::ConnectErrorCode::UNKNOWN;
+  }
+}
 }  // namespace bluetooth