Add GetConnectionInfo function for BluetoothDevice, replacing the existing

device/bluetooth/bluetooth_device_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_device_mac.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 75 matching lines @@
 }
 
 uint16 BluetoothDeviceMac::GetProductID() const {
   return 0;
 }
 
 uint16 BluetoothDeviceMac::GetDeviceID() const {
   return 0;
 }
 
-int BluetoothDeviceMac::GetRSSI() const {
-  if (![device_ isConnected]) {
-    NOTIMPLEMENTED();
-    return kUnknownPower;
-  }
-
-  int rssi = [device_ rawRSSI];
-
-  // The API guarantees that +127 is returned in case the RSSI is not readable:
-  // http://goo.gl/bpURYv
-  if (rssi == 127)
-    return kUnknownPower;
-
-  return rssi;
-}
-
-int BluetoothDeviceMac::GetCurrentHostTransmitPower() const {
-  return GetHostTransmitPower(kReadCurrentTransmitPowerLevel);
-}
-
-int BluetoothDeviceMac::GetMaximumHostTransmitPower() const {
-  return GetHostTransmitPower(kReadMaximumTransmitPowerLevel);
-}
-
 bool BluetoothDeviceMac::IsPaired() const {
   return [device_ isPaired];
 }
 
 bool BluetoothDeviceMac::IsConnected() const {
   return [device_ isConnected];
 }
 
 bool BluetoothDeviceMac::IsConnectable() const {
   return false;
@@ skipping 27 matching lines @@
 bool BluetoothDeviceMac::ExpectingPasskey() const {
   NOTIMPLEMENTED();
   return false;
 }
 
 bool BluetoothDeviceMac::ExpectingConfirmation() const {
   NOTIMPLEMENTED();
   return false;
 }
 
+void GetConnectionInfo(const ConnectionInfoCallback& callback) {
+  ConnectionInfo connection_info;
+  if (![device_ isConnected]) {
+    callback.Run(connection_info);
+    return;
+  }
+
+  connection_info.rssi = [device_ rawRSSI];
+  // The API guarantees that +127 is returned in case the RSSI is not readable:
+  // http://goo.gl/bpURYv
+  if (connection_info.rssi == 127)
+    rssi = kUnknownPower;

[Ilya Sherman, 2014/11/19 22:18:07]

nit: rssi -> connection_info.rssi

[Tim Song, 2014/12/06 00:51:37]

Done.

+
+  connection_info.transmit_power =
+      GetHostTransmitPower(kReadCurrentTransmitPowerLevel);
+  connection.max_transmit_power =

[Ilya Sherman, 2014/11/19 22:18:07]

nit: connection -> connection_info

[Tim Song, 2014/12/06 00:51:37]

Done.

+      GetHostTransmitPower(kReadMaximumTransmitPowerLevel);
+
+  callback.Run(connection_info);
+}
+
 void BluetoothDeviceMac::Connect(
     PairingDelegate* pairing_delegate,
     const base::Closure& callback,
     const ConnectErrorCallback& error_callback) {
   NOTIMPLEMENTED();
 }
 
 void BluetoothDeviceMac::SetPinCode(const std::string& pincode) {
   NOTIMPLEMENTED();
 }
@@ skipping 39 matching lines @@
   error_callback.Run(kApiUnavailable);
 }
 
 void BluetoothDeviceMac::CreateGattConnection(
       const GattConnectionCallback& callback,
       const ConnectErrorCallback& error_callback) {
   // TODO(armansito): Implement.
   error_callback.Run(ERROR_UNSUPPORTED_DEVICE);
 }
 
-void BluetoothDeviceMac::StartConnectionMonitor(
-    const base::Closure& callback,
-    const ErrorCallback& error_callback) {
-  NOTIMPLEMENTED();
-}
-
 NSDate* BluetoothDeviceMac::GetLastInquiryUpdate() {
   return [device_ getLastInquiryUpdate];
 }
 
 int BluetoothDeviceMac::GetHostTransmitPower(
     BluetoothHCITransmitPowerLevelType power_level_type) const {
   IOBluetoothHostController* controller =
       [IOBluetoothHostController defaultController];
 
   // Bail if the undocumented API is unavailable on this machine.
@@ skipping 12 matching lines @@
 
   return power_level;
 }
 
 // static
 std::string BluetoothDeviceMac::GetDeviceAddress(IOBluetoothDevice* device) {
   return CanonicalizeAddress(base::SysNSStringToUTF8([device addressString]));
 }
 
 }  // namespace device