bluetooth: Implement Service.getCharacteristics

content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc

Index: content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc
diff --git a/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc b/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc
index cced25f3d6d64638ad1772868956ff37e20becf3..62a9ee792e3f185deeaf7fd3074da741c7645d9b 100644
--- a/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc
+++ b/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc
@@ -710,7 +710,7 @@ LayoutTestBluetoothAdapterProvider::GetGenericAccessService(
 
   scoped_ptr<NiceMockBluetoothGattCharacteristic> device_name(
       GetBaseGATTCharacteristic(
-          generic_access.get(), kDeviceNameUUID,
+          "Device Name Characteristic", generic_access.get(), kDeviceNameUUID,
           BluetoothGattCharacteristic::PROPERTY_READ |
               BluetoothGattCharacteristic::PROPERTY_WRITE));
 
@@ -741,7 +741,8 @@ LayoutTestBluetoothAdapterProvider::GetHeartRateService(
 
   // Heart Rate Measurement
   scoped_ptr<NiceMockBluetoothGattCharacteristic> heart_rate_measurement(
-      GetBaseGATTCharacteristic(heart_rate.get(), kHeartRateMeasurementUUID,
+      GetBaseGATTCharacteristic("Heart Rate Measurement", heart_rate.get(),
+                                kHeartRateMeasurementUUID,
                                 BluetoothGattCharacteristic::PROPERTY_NOTIFY));
   NiceMockBluetoothGattCharacteristic* measurement_ptr =
       heart_rate_measurement.get();
@@ -761,15 +762,17 @@ LayoutTestBluetoothAdapterProvider::GetHeartRateService(
             return notify_session;
           }));
 
-  // Body Sensor Location Characteristic
-  scoped_ptr<NiceMockBluetoothGattCharacteristic> body_sensor_location(
-      GetBaseGATTCharacteristic(heart_rate.get(), kBodySensorLocation,
+  // Body Sensor Location Characteristic (Chest)
+  scoped_ptr<NiceMockBluetoothGattCharacteristic> body_sensor_location_chest(
+      GetBaseGATTCharacteristic("Body Sensor Location Chest", heart_rate.get(),
+                                kBodySensorLocation,
                                 BluetoothGattCharacteristic::PROPERTY_READ));
-  BluetoothGattCharacteristic* location_ptr = body_sensor_location.get();
+  BluetoothGattCharacteristic* location_chest_ptr =
+      body_sensor_location_chest.get();
 
-  ON_CALL(*body_sensor_location, ReadRemoteCharacteristic(_, _))
+  ON_CALL(*body_sensor_location_chest, ReadRemoteCharacteristic(_, _))
       .WillByDefault(RunCallbackWithResult<0 /* success_callback */>(
-          [adapter, location_ptr]() {
+          [adapter, location_chest_ptr]() {
             std::vector<uint8_t> location(1 /* size */);
             location[0] = 1;  // Chest
             // Read a characteristic has a side effect of
@@ -777,12 +780,35 @@ LayoutTestBluetoothAdapterProvider::GetHeartRateService(
             FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
                               adapter->GetObservers(),
                               GattCharacteristicValueChanged(
-                                  adapter, location_ptr, location));
+                                  adapter, location_chest_ptr, location));
+            return location;
+          }));
+
+  // Body Sensor Location Characteristic (Wrist)
+  scoped_ptr<NiceMockBluetoothGattCharacteristic> body_sensor_location_wrist(
+      GetBaseGATTCharacteristic("Body Sensor Location Wrist", heart_rate.get(),
+                                kBodySensorLocation,
+                                BluetoothGattCharacteristic::PROPERTY_READ));
+  BluetoothGattCharacteristic* location_wrist_ptr =
+      body_sensor_location_wrist.get();
+
+  ON_CALL(*body_sensor_location_wrist, ReadRemoteCharacteristic(_, _))
+      .WillByDefault(RunCallbackWithResult<0 /* success_callback */>(
+          [adapter, location_wrist_ptr]() {
+            std::vector<uint8_t> location(1 /* size */);
+            location[0] = 2;  // Wrist
+            // Read a characteristic has a side effect of
+            // GattCharacteristicValueChanged being called.
+            FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
+                              adapter->GetObservers(),
+                              GattCharacteristicValueChanged(
+                                  adapter, location_wrist_ptr, location));
             return location;
           }));
 
   heart_rate->AddMockCharacteristic(std::move(heart_rate_measurement));
-  heart_rate->AddMockCharacteristic(std::move(body_sensor_location));
+  heart_rate->AddMockCharacteristic(std::move(body_sensor_location_chest));
+  heart_rate->AddMockCharacteristic(std::move(body_sensor_location_wrist));
 
   return heart_rate;
 }
@@ -792,11 +818,12 @@ LayoutTestBluetoothAdapterProvider::GetHeartRateService(
 // static
 scoped_ptr<NiceMockBluetoothGattCharacteristic>
 LayoutTestBluetoothAdapterProvider::GetBaseGATTCharacteristic(
+    const std::string& identifier,
     MockBluetoothGattService* service,
     const std::string& uuid,
     BluetoothGattCharacteristic::Properties properties) {
   return make_scoped_ptr(new NiceMockBluetoothGattCharacteristic(
-      service, uuid + " Identifier", BluetoothUUID(uuid), false /* is_local */,
+      service, identifier, BluetoothUUID(uuid), false /* is_local */,
       properties, NULL /* permissions */));
 }
 
@@ -808,12 +835,12 @@ LayoutTestBluetoothAdapterProvider::GetErrorCharacteristic(
   uint32_t error_alias = error_code + 0xA1;  // Error UUIDs start at 0xA1.
   scoped_ptr<NiceMockBluetoothGattCharacteristic> characteristic(
       GetBaseGATTCharacteristic(
-          service,
+          // Use the UUID to generate unique identifiers.
+          "Error Characteristic " + errorUUID(error_alias), service,
           errorUUID(error_alias),
           BluetoothGattCharacteristic::PROPERTY_READ |
-          BluetoothGattCharacteristic::PROPERTY_WRITE |
-          BluetoothGattCharacteristic::PROPERTY_INDICATE));
-
+              BluetoothGattCharacteristic::PROPERTY_WRITE |
+              BluetoothGattCharacteristic::PROPERTY_INDICATE));
 
   // Read response.
   ON_CALL(*characteristic, ReadRemoteCharacteristic(_, _))