Add GetConnectionInfo function for BluetoothDevice, replacing the existing

device/bluetooth/bluetooth_device_chromeos.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H
 #define DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 20 matching lines @@
     : public device::BluetoothDevice,
       public BluetoothGattServiceClient::Observer {
  public:
   // BluetoothDevice override
   virtual uint32 GetBluetoothClass() const override;
   virtual std::string GetAddress() const override;
   virtual VendorIDSource GetVendorIDSource() const override;
   virtual uint16 GetVendorID() const override;
   virtual uint16 GetProductID() const override;
   virtual uint16 GetDeviceID() const override;
-  virtual int GetRSSI() const override;
-  virtual int GetCurrentHostTransmitPower() const override;
-  virtual int GetMaximumHostTransmitPower() const override;
   virtual bool IsPaired() const override;
   virtual bool IsConnected() const override;
   virtual bool IsConnectable() const override;
   virtual bool IsConnecting() const override;
   virtual UUIDList GetUUIDs() const override;
   virtual bool ExpectingPinCode() const override;
   virtual bool ExpectingPasskey() const override;
   virtual bool ExpectingConfirmation() const override;
+  virtual void GetConnectionInfo(

[armansito, 2015/01/06 20:36:08]

nit: Omit "virtual" when you have "override". I know the existing code does this
incorrectly (I think the person who refactored it just did a find and replace
for OVERRIDE), but let's use the correct style for new code.

[Tim Song, 2015/01/06 22:30:51]

Done.

+      const ConnectionInfoCallback& callback) override;
   virtual void Connect(
       device::BluetoothDevice::PairingDelegate* pairing_delegate,
       const base::Closure& callback,
       const ConnectErrorCallback& error_callback) override;
   virtual void SetPinCode(const std::string& pincode) override;
   virtual void SetPasskey(uint32 passkey) override;
   virtual void ConfirmPairing() override;
   virtual void RejectPairing() override;
   virtual void CancelPairing() override;
   virtual void Disconnect(
       const base::Closure& callback,
       const ErrorCallback& error_callback) override;
   virtual void Forget(const ErrorCallback& error_callback) override;
   virtual void ConnectToService(
       const device::BluetoothUUID& uuid,
       const ConnectToServiceCallback& callback,
       const ConnectToServiceErrorCallback& error_callback) override;
   virtual void ConnectToServiceInsecurely(
       const device::BluetoothUUID& uuid,
       const ConnectToServiceCallback& callback,
       const ConnectToServiceErrorCallback& error_callback) override;
   virtual void CreateGattConnection(
       const GattConnectionCallback& callback,
       const ConnectErrorCallback& error_callback) override;
-  virtual void StartConnectionMonitor(
-      const base::Closure& callback,
-      const ErrorCallback& error_callback) override;
 
   // Creates a pairing object with the given delegate |pairing_delegate| and
   // establishes it as the pairing context for this device. All pairing-related
   // method calls will be forwarded to this object until it is released.
   BluetoothPairingChromeOS* BeginPairing(
       BluetoothDevice::PairingDelegate* pairing_delegate);
 
   // Releases the current pairing object, any pairing-related method calls will
   // be ignored.
   void EndPairing();
@@ skipping 15 matching lines @@
       BluetoothAdapterChromeOS* adapter,
       const dbus::ObjectPath& object_path,
       scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
       scoped_refptr<device::BluetoothSocketThread> socket_thread);
   virtual ~BluetoothDeviceChromeOS();
 
   // BluetoothGattServiceClient::Observer overrides.
   virtual void GattServiceAdded(const dbus::ObjectPath& object_path) override;
   virtual void GattServiceRemoved(const dbus::ObjectPath& object_path) override;
 
+  // Called by dbus:: on completion of the D-Bus method call to get the
+  // connection attributes of the current connection to the device.
+  void OnGetConnInfo(const ConnectionInfoCallback& callback,
+                     int16 rssi,
+                     int16 transmit_power,
+                     int16 max_transmit_power);
+  void OnGetConnInfoError(const ConnectionInfoCallback& callback,
+                          const std::string& error_name,
+                          const std::string& error_message);
+
   // Internal method to initiate a connection to this device, and methods called
   // by dbus:: on completion of the D-Bus method call.
   void ConnectInternal(bool after_pairing,
                        const base::Closure& callback,
                        const ConnectErrorCallback& error_callback);
   void OnConnect(bool after_pairing,
                  const base::Closure& callback);
   void OnCreateGattConnection(const GattConnectionCallback& callback);
   void OnConnectError(bool after_pairing,
                       const ConnectErrorCallback& error_callback,
@@ skipping 27 matching lines @@
                          const std::string& error_name,
                          const std::string& error_message);
 
   // Called by dbus:: on failure of the D-Bus method call to unpair the device;
   // there is no matching completion call since this object is deleted in the
   // process of unpairing.
   void OnForgetError(const ErrorCallback& error_callback,
                      const std::string& error_name,
                      const std::string& error_message);
 
-  // Called by dbus:: on completion of the D-Bus method call to start the
-  // connection monitor.
-  void OnStartConnectionMonitor(const base::Closure& callback);
-  void OnStartConnectionMonitorError(const ErrorCallback& error_callback,
-                                     const std::string& error_name,
-                                     const std::string& error_message);
-
   // The adapter that owns this device instance.
   BluetoothAdapterChromeOS* adapter_;
 
   // The dbus object path of the device object.
   dbus::ObjectPath object_path_;
 
   // Number of ongoing calls to Connect().
   int num_connecting_calls_;
 
   // True if the connection monitor has been started, tracking the connection
@@ skipping 12 matching lines @@
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BluetoothDeviceChromeOS> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceChromeOS);
 };
 
 }  // namespace chromeos
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H