Implement DBus changes needed for notifications.

device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider_impl.cc

 // Copyright 2016 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/dbus/bluetooth_gatt_characteristic_service_provider_impl.h"
 
 #include <cstddef>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 22 matching lines @@
     : origin_thread_id_(base::PlatformThread::CurrentId()),
       uuid_(uuid),
       flags_(flags),
       bus_(bus),
       delegate_(std::move(delegate)),
       object_path_(object_path),
       service_path_(service_path),
       weak_ptr_factory_(this) {
   VLOG(1) << "Created Bluetooth GATT characteristic: " << object_path.value()
           << " UUID: " << uuid;
-
-  // If we have a null bus, this means that this is being initialized for a
-  // test, hence we shouldn't do any other setup.
   if (!bus_)
     return;
 
   DCHECK(delegate_);
   DCHECK(!uuid_.empty());
   DCHECK(object_path_.IsValid());
   DCHECK(service_path_.IsValid());
   DCHECK(base::StartsWith(object_path_.value(), service_path_.value() + "/",
                           base::CompareCase::SENSITIVE));
 
@@ skipping 27 matching lines @@
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::OnExported,
                  weak_ptr_factory_.GetWeakPtr()));
   exported_object_->ExportMethod(
       bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface,
       bluetooth_gatt_characteristic::kWriteValue,
       base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::WriteValue,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::OnExported,
                  weak_ptr_factory_.GetWeakPtr()));
+  exported_object_->ExportMethod(
+      bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface,
+      bluetooth_gatt_characteristic::kStartNotify,
+      base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::StartNotify,
+                 weak_ptr_factory_.GetWeakPtr()),
+      base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::OnExported,
+                 weak_ptr_factory_.GetWeakPtr()));
+  exported_object_->ExportMethod(
+      bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface,
+      bluetooth_gatt_characteristic::kStopNotify,
+      base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::StopNotify,
+                 weak_ptr_factory_.GetWeakPtr()),
+      base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::OnExported,
+                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 BluetoothGattCharacteristicServiceProviderImpl::
     ~BluetoothGattCharacteristicServiceProviderImpl() {
   VLOG(1) << "Cleaning up Bluetooth GATT characteristic: "
           << object_path_.value();
   if (bus_)
     bus_->UnregisterExportedObject(object_path_);
 }
 
 void BluetoothGattCharacteristicServiceProviderImpl::SendValueChanged(
     const std::vector<uint8_t>& value) {
+  // Running a test, don't actually try to write to use DBus.
+  if (!bus_)
+    return;
+
   VLOG(2) << "Emitting a PropertiesChanged signal for characteristic value.";
   dbus::Signal signal(dbus::kDBusPropertiesInterface,
                       dbus::kDBusPropertiesChangedSignal);
   dbus::MessageWriter writer(&signal);
   dbus::MessageWriter array_writer(NULL);
   dbus::MessageWriter dict_entry_writer(NULL);
   dbus::MessageWriter variant_writer(NULL);
 
   // interface_name
   writer.AppendString(
@@ skipping 237 matching lines @@
 
   DCHECK(delegate_);
   delegate_->SetValue(
       value,
       base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::OnWriteValue,
                  weak_ptr_factory_.GetWeakPtr(), method_call, response_sender),
       base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::OnFailure,
                  weak_ptr_factory_.GetWeakPtr(), method_call, response_sender));
 }
 
+void BluetoothGattCharacteristicServiceProviderImpl::StartNotify(

[xiyuan, 2016/05/12 18:33:18]

Silly question: Why StartNotify do delegate_->GetValue and StopNotify do
delegate_->SetValue ?

It does not look like what I saw from bluez doc:
https://kernel.googlesource.com/pub/scm/bluetooth/bluez/+/master/doc/gatt-api...

It seems StartNotify should not return anything and StopNotify does not have any
input.

[rkc, 2016/05/12 19:51:50]

Ugh, this is really stupid of me. I apologize! This is of course, all wrong. I
copy/pasted the code from ReadValue/WriteValue and completely forgot to change
the actual implementation.

This is why we need end-to-end tests. :-\

Fixed.

+    dbus::MethodCall* method_call,
+    dbus::ExportedObject::ResponseSender response_sender) {
+  VLOG(3) << "BluetoothGattCharacteristicServiceProvider::StartNotify: "
+          << object_path_.value();
+  DCHECK(OnOriginThread());
+  DCHECK(delegate_);
+  delegate_->GetValue(
+      base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::OnReadValue,
+                 weak_ptr_factory_.GetWeakPtr(), method_call, response_sender),
+      base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::OnFailure,
+                 weak_ptr_factory_.GetWeakPtr(), method_call, response_sender));
+}
+
+void BluetoothGattCharacteristicServiceProviderImpl::StopNotify(
+    dbus::MethodCall* method_call,
+    dbus::ExportedObject::ResponseSender response_sender) {
+  VLOG(3) << "BluetoothGattCharacteristicServiceProvider::WriteValue: "

[xiyuan, 2016/05/12 18:33:18]

nit: update the message, WriteValue -> StopNotify?

[rkc, 2016/05/12 19:51:50]

Done.

+          << object_path_.value();
+  DCHECK(OnOriginThread());
+
+  dbus::MessageReader reader(method_call);
+  const uint8_t* bytes = NULL;
+  size_t length = 0;
+
+  if (!reader.PopArrayOfBytes(&bytes, &length))
+    VLOG(2) << "Error reading array of bytes in in WriteValue";

[xiyuan, 2016/05/12 18:33:18]

nit: update the message

[rkc, 2016/05/12 19:51:50]

Done.

+  std::vector<uint8_t> value;
+  if (bytes)
+    value.assign(bytes, bytes + length);
+
+  DCHECK(delegate_);
+  delegate_->SetValue(
+      value,
+      base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::OnWriteValue,
+                 weak_ptr_factory_.GetWeakPtr(), method_call, response_sender),
+      base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::OnFailure,
+                 weak_ptr_factory_.GetWeakPtr(), method_call, response_sender));
+}
+
 void BluetoothGattCharacteristicServiceProviderImpl::OnExported(
     const std::string& interface_name,
     const std::string& method_name,
     bool success) {
   LOG_IF(WARNING, !success) << "Failed to export " << interface_name << "."
                             << method_name;
 }
 
 void BluetoothGattCharacteristicServiceProviderImpl::OnGetAll(
     dbus::MethodCall* method_call,
@@ skipping 110 matching lines @@
           method_call, kErrorFailed, "Failed to get/set characteristic value.");
   response_sender.Run(std::move(error_response));
 }
 
 const dbus::ObjectPath&
 BluetoothGattCharacteristicServiceProviderImpl::object_path() const {
   return object_path_;
 }
 
 }  // namespace bluez