Revert of Bluetooth: mac: Crash while loging nil error.

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 543 matching lines @@
 }
 
 void BluetoothAdapterMac::DidFailToConnectPeripheral(CBPeripheral* peripheral,
                                                      NSError* error) {
   BluetoothLowEnergyDeviceMac* device_mac =
       GetBluetoothLowEnergyDeviceMac(peripheral);
   if (!device_mac) {
     [low_energy_central_manager_ cancelPeripheralConnection:peripheral];
     return;
   }
+  VLOG(1) << "Bluetooth error, domain: " << error.domain.UTF8String
+          << ", error code: " << error.code;
   BluetoothDevice::ConnectErrorCode error_code =
-      BluetoothDevice::ConnectErrorCode::ERROR_FAILED;
-  VLOG(1) << "Fail to connect to peripheral";
-  if (error) {
-    error_code = BluetoothDeviceMac::GetConnectErrorCodeFromNSError(error);
-    VLOG(1) << "Bluetooth error, domain: " << error.domain.UTF8String
-            << ", error code: " << error.code
-            << ", converted into: " << error_code;
-  }
+      BluetoothDeviceMac::GetConnectErrorCodeFromNSError(error);
+  VLOG(1) << "Bluetooth error, domain: " << error.domain.UTF8String
+          << ", error code: " << error.code
+          << ", converted into: " << error_code;
   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;
   }
-  VLOG(1) << "Peripheral disconnected";
-  if (error) {
-    VLOG(1) << "Bluetooth error, domain: " << error.domain.UTF8String
-            << ", error code: " << error.code;
-    // TODO(http://crbug.com/585897): Need to pass the error to
-    // DidDisconnectPeripheral().
-  }
-  device_mac->DidDisconnectPeripheral();
+  VLOG(1) << "Bluetooth error, domain: " << error.domain.UTF8String
+          << ", error code: " << error.code;
+  BluetoothDevice::ConnectErrorCode error_code =
+      BluetoothDeviceMac::GetConnectErrorCodeFromNSError(error);
+  device_mac->DidDisconnectPeripheral(error_code);
 }
 
 BluetoothLowEnergyDeviceMac*
 BluetoothAdapterMac::GetBluetoothLowEnergyDeviceMac(CBPeripheral* peripheral) {
   std::string device_address =
       BluetoothLowEnergyDeviceMac::GetPeripheralHashAddress(peripheral);
   DevicesMap::const_iterator iter = devices_.find(device_address);
   if (iter == devices_.end()) {
     return nil;
   }
   return static_cast<BluetoothLowEnergyDeviceMac*>(iter->second);
 }
 
 }  // namespace device