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

device/bluetooth/bluetooth_remote_gatt_service_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_service_chromeos.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "chromeos/dbus/bluetooth_gatt_service_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ skipping 177 matching lines @@
   // Don't send service changed unless we know that all characteristics have
   // already been discovered. This is to prevent spammy events before sending
   // out the first Gatt
   if (!discovery_complete_)
     return;
 
   DCHECK(adapter_);
   adapter_->NotifyGattServiceChanged(this);
 }
 
-void BluetoothRemoteGattServiceChromeOS::NotifyCharacteristicValueChanged(
-    BluetoothRemoteGattCharacteristicChromeOS* characteristic,
-    const std::vector<uint8>& value) {
-  DCHECK(characteristic->GetService() == this);
-  DCHECK(adapter_);
-  adapter_->NotifyGattCharacteristicValueChanged(characteristic, value);
-}
-
 void BluetoothRemoteGattServiceChromeOS::NotifyDescriptorAddedOrRemoved(
     BluetoothRemoteGattCharacteristicChromeOS* characteristic,
     BluetoothRemoteGattDescriptorChromeOS* descriptor,
     bool added) {
   DCHECK(characteristic->GetService() == this);
   DCHECK(descriptor->GetCharacteristic() == characteristic);
   DCHECK(adapter_);
 
   if (added) {
     adapter_->NotifyGattDescriptorAdded(descriptor);
@@ skipping 88 matching lines @@
 
   DCHECK(adapter_);
   adapter_->NotifyGattCharacteristicRemoved(characteristic);
 
   delete characteristic;
 }
 
 void BluetoothRemoteGattServiceChromeOS::GattCharacteristicPropertyChanged(
     const dbus::ObjectPath& object_path,
     const std::string& property_name) {
-  if (characteristics_.find(object_path) == characteristics_.end()) {
+  CharacteristicMap::iterator iter = characteristics_.find(object_path);
+  if (iter == characteristics_.end()) {
     VLOG(3) << "Properties of unknown characteristic changed";
     return;
   }
 
   // We may receive a property changed event in certain cases, e.g. when the
   // characteristic "Flags" property has been updated with values from the
   // "Characteristic Extended Properties" descriptor. In this case, kick off
   // a service changed observer event to let observers refresh the
   // characteristics.
   BluetoothGattCharacteristicClient::Properties* properties =
       DBusThreadManager::Get()->GetBluetoothGattCharacteristicClient()->
           GetProperties(object_path);
+
   DCHECK(properties);
-  if (property_name != properties->flags.name())
-    return;
+  DCHECK(adapter_);
 
-  NotifyServiceChanged();
+  if (property_name == properties->flags.name())
+    NotifyServiceChanged();
+  else if (property_name == properties->value.name())
+    adapter_->NotifyGattCharacteristicValueChanged(iter->second,
+                                                   properties->value.value());
 }
 
 }  // namespace chromeos