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

chromeos/dbus/bluetooth_gatt_characteristic_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/bluetooth_gatt_characteristic_client.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "dbus/bus.h"
 #include "dbus/object_manager.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
+namespace {
+
+// TODO(armansito): Move this constant to cros_system_api.
+const char kValueProperty[] = "Value";
+
+}  // namespace
+
 // static
 const char BluetoothGattCharacteristicClient::kNoResponseError[] =
     "org.chromium.Error.NoResponse";
 // static
 const char BluetoothGattCharacteristicClient::kUnknownCharacteristicError[] =
     "org.chromium.Error.UnknownCharacteristic";
 
 BluetoothGattCharacteristicClient::Properties::Properties(
     dbus::ObjectProxy* object_proxy,
     const std::string& interface_name,
     const PropertyChangedCallback& callback)
     : dbus::PropertySet(object_proxy, interface_name, callback) {
   RegisterProperty(bluetooth_gatt_characteristic::kUUIDProperty, &uuid);
   RegisterProperty(bluetooth_gatt_characteristic::kServiceProperty, &service);
+  RegisterProperty(kValueProperty, &value);
   RegisterProperty(bluetooth_gatt_characteristic::kNotifyingProperty,
                    &notifying);
   RegisterProperty(bluetooth_gatt_characteristic::kFlagsProperty, &flags);
   RegisterProperty(bluetooth_gatt_characteristic::kDescriptorsProperty,
                    &descriptors);
 }
 
 BluetoothGattCharacteristicClient::Properties::~Properties() {
 }
 
@@ skipping 163 matching lines @@
                    object_path));
     return static_cast<dbus::PropertySet*>(properties);
   }
 
   // dbus::ObjectManager::Interface override.
   void ObjectAdded(const dbus::ObjectPath& object_path,
                    const std::string& interface_name) override {
     VLOG(2) << "Remote GATT characteristic added: " << object_path.value();
     FOR_EACH_OBSERVER(BluetoothGattCharacteristicClient::Observer, observers_,
                       GattCharacteristicAdded(object_path));
-
-    // Connect the "ValueUpdated" signal.
-    dbus::ObjectProxy* object_proxy =
-        object_manager_->GetObjectProxy(object_path);
-    DCHECK(object_proxy);
-
-    object_proxy->ConnectToSignal(
-        bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface,
-        bluetooth_gatt_characteristic::kValueUpdatedSignal,
-        base::Bind(&BluetoothGattCharacteristicClientImpl::ValueUpdatedReceived,
-                   weak_ptr_factory_.GetWeakPtr(),
-                   object_path),
-        base::Bind(
-            &BluetoothGattCharacteristicClientImpl::ValueUpdatedConnected,
-            weak_ptr_factory_.GetWeakPtr()));
   }
 
   // dbus::ObjectManager::Interface override.
   void ObjectRemoved(const dbus::ObjectPath& object_path,
                      const std::string& interface_name) override {
     VLOG(2) << "Remote GATT characteristic removed: " << object_path.value();
     FOR_EACH_OBSERVER(BluetoothGattCharacteristicClient::Observer, observers_,
                       GattCharacteristicRemoved(object_path));
   }
 
@@ skipping 15 matching lines @@
   // observers.
   virtual void OnPropertyChanged(const dbus::ObjectPath& object_path,
                                  const std::string& property_name) {
     VLOG(2) << "Remote GATT characteristic property changed: "
             << object_path.value() << ": " << property_name;
     FOR_EACH_OBSERVER(BluetoothGattCharacteristicClient::Observer, observers_,
                       GattCharacteristicPropertyChanged(object_path,
                                                         property_name));
   }
 
-  // Called by dbus:: when a "ValueUpdated" signal is received.
-  void ValueUpdatedReceived(const dbus::ObjectPath& object_path,
-                            dbus::Signal* signal) {
-    DCHECK(signal);
-    const uint8* bytes = NULL;
-    size_t length = 0;
-    dbus::MessageReader reader(signal);
-    if (!reader.PopArrayOfBytes(&bytes, &length)) {
-      LOG(WARNING) << "ValueUpdated signal has incorrect parameters: "
-                   << signal->ToString();
-      return;
-    }
-
-    std::vector<uint8> value;
-    if (bytes)
-      value.assign(bytes, bytes + length);
-
-    FOR_EACH_OBSERVER(BluetoothGattCharacteristicClient::Observer,
-                      observers_,
-                      GattCharacteristicValueUpdated(object_path, value));
-  }
-
-  // Called by dbus:: when the "ValueUpdated" signal is initially connected.
-  void ValueUpdatedConnected(const std::string& interface_name,
-                             const std::string& signal_name,
-                             bool success) {
-    LOG_IF(WARNING, !success) << "Failed to connect to the ValueUpdated signal";
-  }
-
   // Called when a response for successful method call is received.
   void OnSuccess(const base::Closure& callback, dbus::Response* response) {
     DCHECK(response);
     callback.Run();
   }
 
   // Called when a characteristic value response for a successful method call
   // is received.
   void OnValueSuccess(const ValueCallback& callback, dbus::Response* response) {
     DCHECK(response);
@@ skipping 50 matching lines @@
 
 BluetoothGattCharacteristicClient::~BluetoothGattCharacteristicClient() {
 }
 
 // static
 BluetoothGattCharacteristicClient* BluetoothGattCharacteristicClient::Create() {
   return new BluetoothGattCharacteristicClientImpl();
 }
 
 }  // namespace chromeos