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

device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.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 DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_CHROMEOS_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_CHROMEOS_H_
 
 #include <map>
 #include <queue>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
-#include "chromeos/dbus/bluetooth_gatt_characteristic_client.h"
 #include "chromeos/dbus/bluetooth_gatt_descriptor_client.h"
 #include "dbus/object_path.h"
 #include "device/bluetooth/bluetooth_gatt_characteristic.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 
 namespace device {
 
 class BluetoothGattDescriptor;
 class BluetoothGattService;
 
 }  // namespace device
 
 namespace chromeos {
 
 class BluetoothRemoteGattDescriptorChromeOS;
 class BluetoothRemoteGattServiceChromeOS;
 
 // The BluetoothRemoteGattCharacteristicChromeOS class implements
 // BluetoothGattCharacteristic for remote GATT characteristics on the Chrome OS
 // platform.
 class BluetoothRemoteGattCharacteristicChromeOS
     : public device::BluetoothGattCharacteristic,
-      public BluetoothGattCharacteristicClient::Observer,
       public BluetoothGattDescriptorClient::Observer {
  public:
   // device::BluetoothGattCharacteristic overrides.
   virtual std::string GetIdentifier() const override;
   virtual device::BluetoothUUID GetUUID() const override;
   virtual bool IsLocal() const override;
   virtual const std::vector<uint8>& GetValue() const override;
   virtual device::BluetoothGattService* GetService() const override;
   virtual Properties GetProperties() const override;
   virtual Permissions GetPermissions() const override;
@@ skipping 25 matching lines @@
   const dbus::ObjectPath& object_path() const { return object_path_; }
 
  private:
   friend class BluetoothRemoteGattServiceChromeOS;
 
   BluetoothRemoteGattCharacteristicChromeOS(
       BluetoothRemoteGattServiceChromeOS* service,
       const dbus::ObjectPath& object_path);
   virtual ~BluetoothRemoteGattCharacteristicChromeOS();
 
-  // BluetoothGattCharacteristicClient::Observer overrides.
-  virtual void GattCharacteristicValueUpdated(
-      const dbus::ObjectPath& object_path,
-      const std::vector<uint8>& value) override;
-
   // BluetoothGattDescriptorClient::Observer overrides.
   virtual void GattDescriptorAdded(
       const dbus::ObjectPath& object_path) override;
   virtual void GattDescriptorRemoved(
       const dbus::ObjectPath& object_path) override;
-
-  // Called by dbus:: on successful completion of a request to read
-  // the characteristic value.
-  void OnValueSuccess(const ValueCallback& callback,
-                      const std::vector<uint8>& value);
+  virtual void GattDescriptorPropertyChanged(
+      const dbus::ObjectPath& object_path,
+      const std::string& property_name) override;
 
   // Called by dbus:: on unsuccessful completion of a request to read or write
   // the characteristic value.
   void OnError(const ErrorCallback& error_callback,
                const std::string& error_name,
                const std::string& error_message);
 
   // Called by dbus:: on successful completion of a request to start
   // notifications.
   void OnStartNotifySuccess(const NotifySessionCallback& callback);
@@ skipping 16 matching lines @@
 
   // Calls StartNotifySession for each queued request.
   void ProcessStartNotifyQueue();
 
   // Object path of the D-Bus characteristic object.
   dbus::ObjectPath object_path_;
 
   // The GATT service this GATT characteristic belongs to.
   BluetoothRemoteGattServiceChromeOS* service_;
 
-  // The cached characteristic value based on the most recent read or
-  // notification.
-  std::vector<uint8> cached_value_;
-
   // The total number of currently active value update sessions.
   size_t num_notify_sessions_;
 
   // Calls to StartNotifySession that are pending. This can happen during the
   // first remote call to start notifications.
   typedef std::pair<NotifySessionCallback, ErrorCallback>
       PendingStartNotifyCall;
   std::queue<PendingStartNotifyCall> pending_start_notify_calls_;
 
   // True, if a Start or Stop notify call to bluetoothd is currently pending.
@@ skipping 11 matching lines @@
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BluetoothRemoteGattCharacteristicChromeOS>
       weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattCharacteristicChromeOS);
 };
 
 }  // namespace chromeos
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_CHROMEOS_H_