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

device/bluetooth/bluetooth_gatt_chromeos_unittest.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 "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "chromeos/dbus/fake_bluetooth_adapter_client.h"
 #include "chromeos/dbus/fake_bluetooth_agent_manager_client.h"
 #include "chromeos/dbus/fake_bluetooth_device_client.h"
 #include "chromeos/dbus/fake_bluetooth_gatt_characteristic_client.h"
@@ skipping 788 matching lines @@
       base::Bind(&BluetoothGattChromeOSTest::SuccessCallback,
                  base::Unretained(this)),
       base::Bind(&BluetoothGattChromeOSTest::ErrorCallback,
                  base::Unretained(this)));
   EXPECT_TRUE(service_observer.last_gatt_characteristic_id_.empty());
   EXPECT_FALSE(service_observer.last_gatt_characteristic_uuid_.IsValid());
   EXPECT_EQ(0, success_callback_count_);
   EXPECT_EQ(2, error_callback_count_);
   EXPECT_EQ(3, service_observer.gatt_characteristic_value_changed_count_);
 
-  // Issue write request to writeable characteristic. Writing "1" to the control
-  // point characteristic will immediately change its value back to "0", hence
-  // sending "ValueChanged" events twice.
+  // Issue write request to writeable characteristic. The "Body Sensor Location"
+  // characteristic does not send notifications and WriteValue does not result
+  // in a CharacteristicValueChanged event, thus no such event should be
+  // received.
   characteristic = service->GetCharacteristic(
       fake_bluetooth_gatt_characteristic_client_->
           GetHeartRateControlPointPath().value());
   ASSERT_TRUE(characteristic);
   EXPECT_EQ(fake_bluetooth_gatt_characteristic_client_->
                 GetHeartRateControlPointPath().value(),
             characteristic->GetIdentifier());
   EXPECT_EQ(kHeartRateControlPointUUID, characteristic->GetUUID());
   characteristic->WriteRemoteCharacteristic(
       write_value,
       base::Bind(&BluetoothGattChromeOSTest::SuccessCallback,
                  base::Unretained(this)),
       base::Bind(&BluetoothGattChromeOSTest::ErrorCallback,
                  base::Unretained(this)));
-  EXPECT_EQ(characteristic->GetIdentifier(),
-            service_observer.last_gatt_characteristic_id_);
-  EXPECT_EQ(characteristic->GetUUID(),
-            service_observer.last_gatt_characteristic_uuid_);
+  EXPECT_TRUE(service_observer.last_gatt_characteristic_id_.empty());
+  EXPECT_FALSE(service_observer.last_gatt_characteristic_uuid_.IsValid());
   EXPECT_EQ(1, success_callback_count_);
   EXPECT_EQ(2, error_callback_count_);
-  EXPECT_EQ(5, service_observer.gatt_characteristic_value_changed_count_);
+  EXPECT_EQ(3, service_observer.gatt_characteristic_value_changed_count_);
 
-  // Issue a read request.
+  // Issue a read request. A successful read results in a
+  // CharacteristicValueChanged notification.
   characteristic = service->GetCharacteristic(
       fake_bluetooth_gatt_characteristic_client_->
           GetBodySensorLocationPath().value());
   ASSERT_TRUE(characteristic);
   EXPECT_EQ(fake_bluetooth_gatt_characteristic_client_->
                 GetBodySensorLocationPath().value(),
             characteristic->GetIdentifier());
   EXPECT_EQ(kBodySensorLocationUUID, characteristic->GetUUID());
   characteristic->ReadRemoteCharacteristic(
       base::Bind(&BluetoothGattChromeOSTest::ValueCallback,
                  base::Unretained(this)),
       base::Bind(&BluetoothGattChromeOSTest::ErrorCallback,
                  base::Unretained(this)));
   EXPECT_EQ(2, success_callback_count_);
   EXPECT_EQ(2, error_callback_count_);
-  EXPECT_EQ(5, service_observer.gatt_characteristic_value_changed_count_);
+  EXPECT_EQ(4, service_observer.gatt_characteristic_value_changed_count_);
   EXPECT_TRUE(ValuesEqual(characteristic->GetValue(), last_read_value_));
 
   // One last value changed notification.
   base::MessageLoop::current()->Run();
-  EXPECT_EQ(6, service_observer.gatt_characteristic_value_changed_count_);
+  EXPECT_EQ(5, service_observer.gatt_characteristic_value_changed_count_);
   EXPECT_EQ(kHeartRateMeasurementUUID,
             service_observer.last_gatt_characteristic_uuid_);
   EXPECT_EQ(fake_bluetooth_gatt_characteristic_client_->
                 GetHeartRateMeasurementPath().value(),
             service_observer.last_gatt_characteristic_id_);
 }
 
 TEST_F(BluetoothGattChromeOSTest, GattDescriptorValue) {
   fake_bluetooth_device_client_->CreateDevice(
       dbus::ObjectPath(FakeBluetoothAdapterClient::kAdapterPath),
@@ skipping 78 matching lines @@
                  base::Unretained(this)));
   EXPECT_EQ(3, success_callback_count_);
   EXPECT_EQ(0, error_callback_count_);
   EXPECT_TRUE(ValuesEqual(last_read_value_, descriptor->GetValue()));
   EXPECT_TRUE(ValuesEqual(desc_value, descriptor->GetValue()));
   EXPECT_EQ(4, service_observer.gatt_service_changed_count_);
   EXPECT_EQ(1, service_observer.gatt_descriptor_value_changed_count_);
 }
 
 }  // namespace chromeos