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

device/bluetooth/bluetooth_remote_gatt_descriptor_chromeos.cc

 // 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.
 
 #include "device/bluetooth/bluetooth_remote_gatt_descriptor_chromeos.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "chromeos/dbus/bluetooth_gatt_descriptor_client.h"
@@ skipping 42 matching lines @@
   DCHECK(properties);
   return device::BluetoothUUID(properties->uuid.value());
 }
 
 bool BluetoothRemoteGattDescriptorChromeOS::IsLocal() const {
   return false;
 }
 
 const std::vector<uint8>&
 BluetoothRemoteGattDescriptorChromeOS::GetValue() const {
-  return cached_value_;
+  BluetoothGattDescriptorClient::Properties* properties =
+      DBusThreadManager::Get()
+          ->GetBluetoothGattDescriptorClient()
+          ->GetProperties(object_path_);
+
+  DCHECK(properties);
+
+  return properties->value.value();
 }
 
 device::BluetoothGattCharacteristic*
 BluetoothRemoteGattDescriptorChromeOS::GetCharacteristic() const {
   return characteristic_;
 }
 
 device::BluetoothGattCharacteristic::Permissions
 BluetoothRemoteGattDescriptorChromeOS::GetPermissions() const {
   // TODO(armansito): Once BlueZ defines the permissions, return the correct
   // values here.
   return device::BluetoothGattCharacteristic::PERMISSION_NONE;
 }
 
 void BluetoothRemoteGattDescriptorChromeOS::ReadRemoteDescriptor(
     const ValueCallback& callback,
     const ErrorCallback& error_callback) {
   VLOG(1) << "Sending GATT characteristic descriptor read request to "
           << "descriptor: " << GetIdentifier() << ", UUID: "
           << GetUUID().canonical_value();
 
   DBusThreadManager::Get()->GetBluetoothGattDescriptorClient()->ReadValue(
-      object_path_,
-      base::Bind(&BluetoothRemoteGattDescriptorChromeOS::OnValueSuccess,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 callback),
+      object_path_, callback,
       base::Bind(&BluetoothRemoteGattDescriptorChromeOS::OnError,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 error_callback));
+                 weak_ptr_factory_.GetWeakPtr(), error_callback));
 }
 
 void BluetoothRemoteGattDescriptorChromeOS::WriteRemoteDescriptor(
     const std::vector<uint8>& new_value,
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
   VLOG(1) << "Sending GATT characteristic descriptor write request to "
           << "characteristic: " << GetIdentifier() << ", UUID: "
           << GetUUID().canonical_value() << ", with value: "
           << new_value << ".";
 
   DBusThreadManager::Get()->GetBluetoothGattDescriptorClient()->WriteValue(
       object_path_,
       new_value,
       callback,
       base::Bind(&BluetoothRemoteGattDescriptorChromeOS::OnError,
                  weak_ptr_factory_.GetWeakPtr(),
                  error_callback));
 }
 
-void BluetoothRemoteGattDescriptorChromeOS::OnValueSuccess(
-    const ValueCallback& callback,
-    const std::vector<uint8>& value) {
-  VLOG(1) << "Descriptor value read: " << value;
-  cached_value_ = value;
-
-  DCHECK(characteristic_);
-  BluetoothRemoteGattServiceChromeOS* service =
-      static_cast<BluetoothRemoteGattServiceChromeOS*>(
-          characteristic_->GetService());
-  DCHECK(service);
-  service->NotifyDescriptorValueChanged(characteristic_, this, value);
-  callback.Run(value);
-}
-
 void BluetoothRemoteGattDescriptorChromeOS::OnError(
     const ErrorCallback& error_callback,
     const std::string& error_name,
     const std::string& error_message) {
   VLOG(1) << "Operation failed: " << error_name
           << ", message: " << error_message;
 
   error_callback.Run(
       BluetoothRemoteGattServiceChromeOS::DBusErrorToServiceError(error_name));
 }
 
 }  // namespace chromeos