Add GetConnectionInfo function for BluetoothDevice, replacing the existing

chromeos/dbus/bluetooth_device_client.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 CHROMEOS_DBUS_BLUETOOTH_DEVICE_CLIENT_H_
 #define CHROMEOS_DBUS_BLUETOOTH_DEVICE_CLIENT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 62 matching lines @@
     // give false positives. Read-only.
     dbus::Property<bool> legacy_pairing;
 
     // Remote Device ID information in Linux kernel modalias format. Read-only.
     dbus::Property<std::string> modalias;
 
     // Received signal strength indicator that is set when the device is
     // discovered during inquiry. Read-only.
     dbus::Property<int16> rssi;
 
-    // Received signal strength indicator when a connection is open to the
-    // device. This property is not set unless connection monitor is enabled.
-    // Read-only.
-    dbus::Property<int16> connection_rssi;
-
-    // The transmit power level of the host when a connection is open
-    // to the device. This property is not set unless connection monitor is
-    // enabled. Read-only.
-    dbus::Property<int16> connection_tx_power;
-
-    // The maximum transmit power level of the host that can be set
-    // when connected to the device. Read-only.
-    dbus::Property<int16> connection_tx_power_max;
-
     Properties(dbus::ObjectProxy* object_proxy,
                const std::string& interface_name,
                const PropertyChangedCallback& callback);
     virtual ~Properties();
   };
 
   // Interface for observing changes from a remote bluetooth device.
   class Observer {
    public:
     virtual ~Observer() {}
@@ skipping 70 matching lines @@
   virtual void Pair(const dbus::ObjectPath& object_path,
                     const base::Closure& callback,
                     const ErrorCallback& error_callback) = 0;
 
   // Cancels an in-progress pairing with the device with object path
   // |object_path| initiated by Pair().
   virtual void CancelPairing(const dbus::ObjectPath& object_path,
                              const base::Closure& callback,
                              const ErrorCallback& error_callback) = 0;
 
-  // Starts connection monitor for the device with object path
-  // |object_path|. Connection monitor is a mode the connection properties,
-  // RSSI and TX power are tracked and updated when they change.
-  virtual void StartConnectionMonitor(const dbus::ObjectPath& object_path,
-                                      const base::Closure& callback,
-                                      const ErrorCallback& error_callback) = 0;
+  // The callback invoked for as successful GetConnInfo API call with the
+  // RSSI, TX power, and maximum TX power of the current connection.
+  typedef base::Callback<void(int16 rssi,
+                              int16 transmit_power,
+                              int16 max_transmit_power)> ConnInfoCallback;
 
-  // Stops connection monitor for the device with object path
-  // |object_path|.
-  virtual void StopConnectionMonitor(const dbus::ObjectPath& object_path,
-                                     const base::Closure& callback,
-                                     const ErrorCallback& error_callback) = 0;
+  // Returns the RSSI, TX power, and maximum TX power of a connection to the
+  // device with object path |object_path|. If the device is not connected, then
+  // an error will be returned.
+  virtual void GetConnInfo(const dbus::ObjectPath& object_path,
+                           const ConnInfoCallback& callback,
+                           const ErrorCallback& error_callback) = 0;
 
   // Creates the instance.
   static BluetoothDeviceClient* Create();
 
   // Constants used to indicate exceptional error conditions.
   static const char kNoResponseError[];
   static const char kUnknownDeviceError[];
 
  protected:
   BluetoothDeviceClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_BLUETOOTH_DEVICE_CLIENT_H_