[Bluetooth] Improve the adapter's awareness of connected devices.

device/bluetooth/bluetooth_rfcomm_channel_mac.mm

 // Copyright 2014 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_rfcomm_channel_mac.h"
 
 #include "base/logging.h"
 #include "device/bluetooth/bluetooth_device_mac.h"
 #include "device/bluetooth/bluetooth_socket_mac.h"
 
@@ skipping 92 matching lines @@
     return;
 
   // Now that the socket is set, it's safe to associate a delegate, which can
   // call back to the socket.
   DCHECK(!delegate_);
   delegate_.reset(
       [[BluetoothRfcommChannelDelegate alloc] initWithChannel:this]);
   [channel_ setDelegate:delegate_];
 }
 
-std::string BluetoothRfcommChannelMac::GetDeviceAddress() {
-  return BluetoothDeviceMac::GetDeviceAddress([channel_ getDevice]);
+IOBluetoothDevice* BluetoothRfcommChannelMac::GetDevice() {
+  return [channel_ getDevice];
 }
 
 uint16_t BluetoothRfcommChannelMac::GetOutgoingMTU() {
   return [channel_ getMTU];
 }
 
 IOReturn BluetoothRfcommChannelMac::WriteAsync(void* data,
                                                uint16_t length,
                                                void* refcon) {
   DCHECK_LE(length, GetOutgoingMTU());
@@ skipping 34 matching lines @@
     void* refcon,
     IOReturn status) {
   // Note: We use "CHECK" below to ensure we never run into unforeseen
   // occurrences of asynchronous callbacks, which could lead to data
   // corruption.
   CHECK_EQ(channel_, channel);
   socket()->OnChannelWriteComplete(refcon, status);
 }
 
 }  // namespace device