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

chromeos/dbus/fake_bluetooth_gatt_descriptor_client.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 "chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
+#include "chromeos/dbus/bluetooth_gatt_characteristic_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 const char FakeBluetoothGattDescriptorClient::
     kClientCharacteristicConfigurationPathComponent[] = "desc0000";
 const char FakeBluetoothGattDescriptorClient::
     kClientCharacteristicConfigurationUUID[] =
         "00002902-0000-1000-8000-00805f9b34fb";
 
@@ skipping 75 matching lines @@
 void FakeBluetoothGattDescriptorClient::ReadValue(
     const dbus::ObjectPath& object_path,
     const ValueCallback& callback,
     const ErrorCallback& error_callback) {
   PropertiesMap::iterator iter = properties_.find(object_path);
   if (iter == properties_.end()) {
     error_callback.Run(kUnknownDescriptorError, "");
     return;
   }
 
-  callback.Run(iter->second->value);
+  // Assign the value of the descriptor as necessary
+  Properties* properties = iter->second->properties.get();
+  if (properties->uuid.value() == kClientCharacteristicConfigurationUUID) {
+    BluetoothGattCharacteristicClient::Properties* chrc_props =
+        DBusThreadManager::Get()
+            ->GetBluetoothGattCharacteristicClient()
+            ->GetProperties(properties->characteristic.value());
+    DCHECK(chrc_props);
+
+    uint8_t value_byte = chrc_props->notifying.value() ? 0x01 : 0x00;
+    const std::vector<uint8_t>& cur_value = properties->value.value();
+
+    if (!cur_value.size() || cur_value[0] != value_byte) {
+      std::vector<uint8_t> value = {value_byte, 0x00};
+      properties->value.ReplaceValue(value);
+    }
+  }
+
+  callback.Run(iter->second->properties->value.value());
 }
 
 void FakeBluetoothGattDescriptorClient::WriteValue(
     const dbus::ObjectPath& object_path,
     const std::vector<uint8>& value,
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
   if (properties_.find(object_path) == properties_.end()) {
     error_callback.Run(kUnknownDescriptorError, "");
     return;
@@ skipping 29 matching lines @@
   Properties* properties = new Properties(base::Bind(
       &FakeBluetoothGattDescriptorClient::OnPropertyChanged,
       weak_ptr_factory_.GetWeakPtr(),
       object_path));
   properties->uuid.ReplaceValue(uuid);
   properties->characteristic.ReplaceValue(characteristic_path);
 
   DescriptorData* data = new DescriptorData();
   data->properties.reset(properties);
 
-  data->value.push_back(1);  // Notifications enabled.
-  data->value.push_back(0);
-
   properties_[object_path] = data;
 
   NotifyDescriptorAdded(object_path);
 
   return object_path;
 }
 
 void FakeBluetoothGattDescriptorClient::HideDescriptor(
     const dbus::ObjectPath& descriptor_path) {
   PropertiesMap::iterator iter = properties_.find(descriptor_path);
@@ skipping 24 matching lines @@
                     GattDescriptorAdded(object_path));
 }
 
 void FakeBluetoothGattDescriptorClient::NotifyDescriptorRemoved(
     const dbus::ObjectPath& object_path) {
   FOR_EACH_OBSERVER(BluetoothGattDescriptorClient::Observer, observers_,
                     GattDescriptorRemoved(object_path));
 }
 
 }  // namespace chromeos