Adding the last test related with connect/disconnect

device/bluetooth/bluetooth_adapter_mac.mm

 // Copyright 2013 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 "device/bluetooth/bluetooth_adapter_mac.h"
 
 #import <IOBluetooth/objc/IOBluetoothDevice.h>
 #import <IOBluetooth/objc/IOBluetoothHostController.h>
 #include <stddef.h>
 
@@ skipping 24 matching lines @@
 // The frequency with which to poll the adapter for updates.
 const int kPollIntervalMs = 500;
 
 }  // namespace
 
 namespace device {
 
 // static
 const NSTimeInterval BluetoothAdapterMac::kDiscoveryTimeoutSec =
     180;  // 3 minutes
+static NSString* const kErrorDomain = @"ConnectErrorCode";
 
 // static
 base::WeakPtr<BluetoothAdapter> BluetoothAdapter::CreateAdapter(
     const InitCallback& init_callback) {
   return BluetoothAdapterMac::CreateAdapter();
 }
 
 // static
 base::WeakPtr<BluetoothAdapterMac> BluetoothAdapterMac::CreateAdapter() {
   BluetoothAdapterMac* adapter = new BluetoothAdapterMac();
@@ skipping 511 matching lines @@
 }
 
 void BluetoothAdapterMac::DidFailToConnectPeripheral(CBPeripheral* peripheral,
                                                      NSError* error) {
   BluetoothLowEnergyDeviceMac* device_mac =
       GetBluetoothLowEnergyDeviceMac(peripheral);
   if (!device_mac) {
     [low_energy_central_manager_ cancelPeripheralConnection:peripheral];
     return;
   }
-  // TODO(http://crbug.com/585894): Need to convert the error.
-  device_mac->DidFailToConnectGatt(BluetoothClassicDeviceMac::ERROR_UNKNOWN);
+  BluetoothDevice::ConnectErrorCode error_code =
+      BluetoothAdapterMac::GetConnectErrorCodeFromNSError(error);
+  device_mac->DidFailToConnectGatt(error_code);
 }
 
 void BluetoothAdapterMac::DidDisconnectPeripheral(CBPeripheral* peripheral,
                                                   NSError* error) {
   BluetoothLowEnergyDeviceMac* device_mac =
       GetBluetoothLowEnergyDeviceMac(peripheral);
   if (!device_mac) {
     [low_energy_central_manager_ cancelPeripheralConnection:peripheral];
     return;
   }
-  // TODO(http://crbug.com/585897): Need to pass the error.
-  device_mac->DidDisconnectPeripheral();
+  BluetoothDevice::ConnectErrorCode error_code =
+      BluetoothAdapterMac::GetConnectErrorCodeFromNSError(error);
+  device_mac->DidDisconnectPeripheral(error_code);
 }
 
 BluetoothLowEnergyDeviceMac*
 BluetoothAdapterMac::GetBluetoothLowEnergyDeviceMac(CBPeripheral* peripheral) {
   std::string device_address =
       BluetoothLowEnergyDeviceMac::GetPeripheralHashAddress(peripheral);
   // Try to find device from |devices_| with key |device_address|,
   // if has no entry in the map, disconnect the peripheral.
   DevicesMap::const_iterator iter = devices_.find(device_address);
   if (iter == devices_.end()) {
     return nil;
   }
   return static_cast<BluetoothLowEnergyDeviceMac*>(iter->second);
 }
 
+NSError* BluetoothAdapterMac::GetNSErrorFromConnectErrorCode(
+    BluetoothDevice::ConnectErrorCode error_code) {
+  // TODO(http://crbug.com/585894): Need to convert the error.
+  return [NSError errorWithDomain:kErrorDomain code:error_code userInfo:nil];
+}
+
+BluetoothDevice::ConnectErrorCode
+BluetoothAdapterMac::GetConnectErrorCodeFromNSError(NSError* error) {
+  if ([error.domain isEqualToString:kErrorDomain]) {
+    switch ((BluetoothDevice::ConnectErrorCode)error.code) {

[scheib, 2016/02/10 23:48:16]

I don't think this static cast will work. The BluetoothDevice error enums aren't
given GATT values. At quick look: NSError doesn't seem to define in any way what
the error values will be, in which case we should histogram them and learn over
time what is experienced, or guess they are GATT error codes and use hard coded
values. See
https://code.google.com/p/chromium/codesearch#chromium/src/device/bluetooth/b...

[jlebel, 2016/02/11 00:03:43]

I'm not sure to understand. This switch is executed only if the domain is ours :
kErrorDomain. So if it is ours, the NSError that we have, can only be created in
|BluetoothLowEnergyDeviceMac*
BluetoothAdapterMac::GetBluetoothLowEnergyDeviceMac(CBPeripheral* peripheral)|.
Therefore the code is definitely a |BluetoothDevice::ConnectErrorCode|.

[scheib, 2016/03/02 05:33:22]

OK, I didn't see or properly understand the NSError domain until you pointed
this out. Some thoughts:

DCHECK only for assertions that aren't checked by code. This is a bit odd, read
up on it here:
http://dev.chromium.org/developers/coding-style#TOC-CHECK-DCHECK-and-NOTREACHED-

We don't need the switch statement. ConnectErrorCode has
NUM_CONNECT_ERROR_CODES, so you can do a if check that error.code is >= 0 and <
NUM_CONNECT_ERROR_CODES and then do a
static_cast<BluetoothDevice::ConnectErrorCode>(error.code).

[jlebel, 2016/03/02 15:34:32]

Yes, of course!

+      case BluetoothDevice::ERROR_ATTRIBUTE_LENGTH_INVALID:
+        return BluetoothDevice::ERROR_ATTRIBUTE_LENGTH_INVALID;
+      case BluetoothDevice::ERROR_AUTH_CANCELED:
+        return BluetoothDevice::ERROR_AUTH_CANCELED;
+      case BluetoothDevice::ERROR_AUTH_FAILED:
+        return BluetoothDevice::ERROR_AUTH_FAILED;
+      case BluetoothDevice::ERROR_AUTH_REJECTED:
+        return BluetoothDevice::ERROR_AUTH_REJECTED;
+      case BluetoothDevice::ERROR_AUTH_TIMEOUT:
+        return BluetoothDevice::ERROR_AUTH_TIMEOUT;
+      case BluetoothDevice::ERROR_CONNECTION_CONGESTED:
+        return BluetoothDevice::ERROR_CONNECTION_CONGESTED;
+      case BluetoothDevice::ERROR_FAILED:
+        return BluetoothDevice::ERROR_FAILED;
+      case BluetoothDevice::ERROR_INPROGRESS:
+        return BluetoothDevice::ERROR_INPROGRESS;
+      case BluetoothDevice::ERROR_INSUFFICIENT_ENCRYPTION:
+        return BluetoothDevice::ERROR_INSUFFICIENT_ENCRYPTION;
+      case BluetoothDevice::ERROR_OFFSET_INVALID:
+        return BluetoothDevice::ERROR_OFFSET_INVALID;
+      case BluetoothDevice::ERROR_READ_NOT_PERMITTED:
+        return BluetoothDevice::ERROR_READ_NOT_PERMITTED;
+      case BluetoothDevice::ERROR_REQUEST_NOT_SUPPORTED:
+        return BluetoothDevice::ERROR_REQUEST_NOT_SUPPORTED;
+      case BluetoothDevice::ERROR_UNKNOWN:
+        return BluetoothDevice::ERROR_UNKNOWN;
+      case BluetoothDevice::ERROR_UNSUPPORTED_DEVICE:
+        return BluetoothDevice::ERROR_UNSUPPORTED_DEVICE;
+      case BluetoothDevice::ERROR_WRITE_NOT_PERMITTED:
+        return BluetoothDevice::ERROR_WRITE_NOT_PERMITTED;
+      case BluetoothDevice::NUM_CONNECT_ERROR_CODES:
+        DCHECK(false);
+        return BluetoothDevice::ERROR_UNKNOWN;
+    }
+  }
+  // TODO(http://crbug.com/585894): Need to convert the error.
+  return BluetoothDevice::ERROR_UNKNOWN;
+}
+
 }  // namespace device