device/bluetooth: Update characteristic value D-Bus bindings.

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"
 #include "device/bluetooth/bluetooth_device_chromeos.h"
 #include "device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h"
 #include "device/bluetooth/bluetooth_remote_gatt_descriptor_chromeos.h"
 
 namespace chromeos {
 
-namespace {
-
-// Stream operator for logging vector<uint8>.
-std::ostream& operator<<(std::ostream& out, const std::vector<uint8> bytes) {
-  out << "[";
-  for (std::vector<uint8>::const_iterator iter = bytes.begin();
-       iter != bytes.end(); ++iter) {
-    out << base::StringPrintf("%02X", *iter);
-  }
-  return out << "]";
-}
-
-}  // namespace
-
 BluetoothRemoteGattServiceChromeOS::BluetoothRemoteGattServiceChromeOS(
     BluetoothDeviceChromeOS* device,
     const dbus::ObjectPath& object_path)
     : object_path_(object_path),
       device_(device),
       weak_ptr_factory_(this) {
   VLOG(1) << "Creating remote GATT service with identifier: "
           << object_path.value() << ", UUID: " << GetUUID().canonical_value();
   DBusThreadManager::Get()->GetBluetoothGattServiceClient()->AddObserver(this);
   DBusThreadManager::Get()->GetBluetoothGattCharacteristicClient()->
@@ skipping 117 matching lines @@
     const ErrorCallback& error_callback) {
   VLOG(1) << "A remote GATT service cannot be unregistered.";
   error_callback.Run();
 }
 
 void BluetoothRemoteGattServiceChromeOS::NotifyServiceChanged() {
   FOR_EACH_OBSERVER(device::BluetoothGattService::Observer, observers_,
                     GattServiceChanged(this));
 }
 
+void BluetoothRemoteGattServiceChromeOS::NotifyCharacteristicValueChanged(
+    BluetoothRemoteGattCharacteristicChromeOS* characteristic,
+    const std::vector<uint8>& value) {
+  DCHECK(characteristic->GetService() == this);
+  FOR_EACH_OBSERVER(
+      device::BluetoothGattService::Observer,
+      observers_,
+      GattCharacteristicValueChanged(this, characteristic, value));
+}
+
 void BluetoothRemoteGattServiceChromeOS::NotifyDescriptorAddedOrRemoved(
     BluetoothRemoteGattCharacteristicChromeOS* characteristic,
     BluetoothRemoteGattDescriptorChromeOS* descriptor,
     bool added) {
   DCHECK(characteristic->GetService() == this);
   DCHECK(descriptor->GetCharacteristic() == characteristic);
   if (added) {
     FOR_EACH_OBSERVER(device::BluetoothGattService::Observer, observers_,
                       GattDescriptorAdded(characteristic, descriptor));
     return;
@@ skipping 69 matching lines @@
   DCHECK(characteristic->object_path() == object_path);
   characteristics_.erase(iter);
 
   FOR_EACH_OBSERVER(device::BluetoothGattService::Observer, observers_,
                     GattCharacteristicRemoved(this, characteristic));
   NotifyServiceChanged();
 
   delete characteristic;
 }
 
-void BluetoothRemoteGattServiceChromeOS::GattCharacteristicPropertyChanged(
-    const dbus::ObjectPath& object_path,
-    const std::string& property_name) {
-  CharacteristicMap::iterator iter = characteristics_.find(object_path);
-  if (iter == characteristics_.end()) {
-    VLOG(2) << "Unknown GATT characteristic property changed: "
-            << object_path.value();
-    return;
-  }
-
-  // Ignore all property changes except for "Value".
-  BluetoothGattCharacteristicClient::Properties* properties =
-      DBusThreadManager::Get()->GetBluetoothGattCharacteristicClient()->
-          GetProperties(object_path);
-  DCHECK(properties);
-  if (property_name != properties->value.name())
-    return;
-
-  VLOG(1) << "GATT characteristic value has changed: " << object_path.value()
-          << ": " << properties->value.value();
-  FOR_EACH_OBSERVER(device::BluetoothGattService::Observer, observers_,
-                    GattCharacteristicValueChanged(this, iter->second,
-                                                   properties->value.value()));
-}
-
 }  // namespace chromeos