| 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 7f3563fe98c6fe9414363da271b42ac815098454..aff0745edb11545d9e473f4f2644007ffa0e7235 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
|
| @@ -178,9 +178,15 @@ LayoutTestBluetoothAdapterProvider::GetEmptyDevice(
|
|
|
| scoped_ptr<NiceMock<MockBluetoothGattService>> generic_access(
|
| GetGattService(empty_device.get(), "1800" /* Generic Access */));
|
| - generic_access->AddMockCharacteristic(
|
| + scoped_ptr<NiceMock<MockBluetoothGattCharacteristic>> device_name(
|
| GetGattCharacteristic(generic_access.get(), "2A00" /* Device Name */));
|
|
|
| + std::string value_str("Empty Mock Device name");
|
| + std::vector<uint8_t> value(value_str.begin(), value_str.end());
|
| + ON_CALL(*device_name, ReadRemoteCharacteristic(_, _))
|
| + .WillByDefault(RunCallback<0>(value));
|
| + generic_access->AddMockCharacteristic(device_name.Pass());
|
| +
|
| scoped_ptr<NiceMock<MockBluetoothGattService>> generic_attribute(
|
| GetGattService(empty_device.get(), "1801" /* Generic Attribute */));
|
| generic_attribute->AddMockCharacteristic(GetGattCharacteristic(
|
| @@ -250,6 +256,11 @@ LayoutTestBluetoothAdapterProvider::GetGattService(MockBluetoothDevice* device,
|
| ON_CALL(*service, GetCharacteristics())
|
| .WillByDefault(Invoke(service.get(),
|
| &MockBluetoothGattService::GetMockCharacteristics));
|
| +
|
| + ON_CALL(*service, GetCharacteristic(_))
|
| + .WillByDefault(Invoke(service.get(),
|
| + &MockBluetoothGattService::GetMockCharacteristic));
|
| +
|
| return service.Pass();
|
| }
|
|
|
|
|