chromeos/dbus: Update Bluetooth GATT API clients to upstream definition

chromeos/dbus/bluetooth_gatt_characteristic_client.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_BLUETOOTH_GATT_CHARACTERISTIC_CLIENT_H_
 #define CHROMEOS_DBUS_BLUETOOTH_GATT_CHARACTERISTIC_CLIENT_H_
 
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/dbus_client.h"
 #include "dbus/object_path.h"
 #include "dbus/property.h"
 
 namespace chromeos {
 
 // BluetoothGattCharacteristicClient is used to communicate with remote GATT
 // characteristic objects exposed by the Bluetooth daemon.
 class CHROMEOS_EXPORT BluetoothGattCharacteristicClient : public DBusClient {
  public:
   // Structure of properties associated with GATT characteristics.
   struct Properties : public dbus::PropertySet {
     // The 128-bit characteristic UUID. [read-only]
     dbus::Property<std::string> uuid;
 
     // Object path of the GATT service the characteristic belongs to.
     // [read-only]
     dbus::Property<dbus::ObjectPath> service;
 
+    // The cached value of the characteristic. This property gets updated only
+    // after a successful read request and when a notification or indication is
+    // received. [read-only]
+    dbus::Property<std::vector<uint8_t>> value;
+
     // Whether or not this characteristic is currently sending ValueUpdated
     // signals. [read-only]
     dbus::Property<bool> notifying;
 
     // List of flags representing the GATT "Characteristic Properties bit field"
     // and properties read from the GATT "Characteristic Extended Properties"
     // descriptor bit field. [read-only, optional]
-    dbus::Property<std::vector<std::string> > flags;
+    dbus::Property<std::vector<std::string>> flags;
 
     // Array of object paths representing the descriptors of this
     // characteristic. [read-only]
-    dbus::Property<std::vector<dbus::ObjectPath> > descriptors;
+    dbus::Property<std::vector<dbus::ObjectPath>> descriptors;
 
     Properties(dbus::ObjectProxy* object_proxy,
                const std::string& interface_name,
                const PropertyChangedCallback& callback);
     ~Properties() override;
   };
 
   // Interface for observing changes from a remote GATT characteristic.
   class Observer {
    public:
     virtual ~Observer() {}
 
     // Called when the GATT characteristic with object path |object_path| is
     // added to the system.
     virtual void GattCharacteristicAdded(const dbus::ObjectPath& object_path) {}
 
     // Called when the GATT characteristic with object path |object_path| is
     // removed from the system.
     virtual void GattCharacteristicRemoved(
         const dbus::ObjectPath& object_path) {}
 
     // Called when the GATT characteristic with object path |object_path| has a
     // change in the value of the property named |property_name|.
     virtual void GattCharacteristicPropertyChanged(
         const dbus::ObjectPath& object_path,
         const std::string& property_name) {}
-
-    // Called when a "ValueUpdated" signal is received from the remote GATT
-    // characteristic with object path |object_path| with characteristic value
-    // |value|.
-    virtual void GattCharacteristicValueUpdated(
-        const dbus::ObjectPath& object_path,
-        const std::vector<uint8>& value) {}
   };
 
   // Callbacks used to report the result of asynchronous methods.
   typedef base::Callback<void(const std::string& error_name,
                               const std::string& error_message)> ErrorCallback;
   typedef base::Callback<void(const std::vector<uint8>& value)> ValueCallback;
 
   ~BluetoothGattCharacteristicClient() override;
 
   // Adds and removes observers for events on all remote GATT characteristics.
@@ skipping 48 matching lines @@
  protected:
   BluetoothGattCharacteristicClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BluetoothGattCharacteristicClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_BLUETOOTH_GATT_CHARACTERISTIC_CLIENT_H_