| 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 1781dcd851f67c269686daadef3de27b378b4396..fec73a2cd49df778fd9c5bfc94349c3bcf38b8a3 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
|
| @@ -167,6 +167,10 @@ LayoutTestBluetoothAdapterProvider::GetBluetoothAdapter(
|
| return GetMissingCharacteristicHeartRateAdapter();
|
| if (fake_adapter_name == "HeartRateAdapter")
|
| return GetHeartRateAdapter();
|
| + if (fake_adapter_name == "EmptyNameHeartRateAdapter")
|
| + return GetEmptyNameHeartRateAdapter();
|
| + if (fake_adapter_name == "NoNameHeartRateAdapter")
|
| + return GetNoNameHeartRateAdapter();
|
| if (fake_adapter_name == "TwoHeartRateServicesAdapter")
|
| return GetTwoHeartRateServicesAdapter();
|
| if (fake_adapter_name == "DisconnectingHeartRateAdapter")
|
| @@ -456,6 +460,42 @@ LayoutTestBluetoothAdapterProvider::GetHeartRateAdapter() {
|
|
|
| // static
|
| scoped_refptr<NiceMockBluetoothAdapter>
|
| +LayoutTestBluetoothAdapterProvider::GetEmptyNameHeartRateAdapter() {
|
| + scoped_refptr<NiceMockBluetoothAdapter> adapter(GetEmptyAdapter());
|
| + std::unique_ptr<NiceMockBluetoothDevice> device(
|
| + GetHeartRateDevice(adapter.get(), /* device_name */ ""));
|
| +
|
| + // TODO(ortuno): Implement the rest of the service's characteristics
|
| + // See: http://crbug.com/529975
|
| +
|
| + device->AddMockService(GetGenericAccessService(device.get()));
|
| + device->AddMockService(GetHeartRateService(adapter.get(), device.get()));
|
| +
|
| + adapter->AddMockDevice(std::move(device));
|
| +
|
| + return adapter;
|
| +}
|
| +
|
| +// static
|
| +scoped_refptr<NiceMockBluetoothAdapter>
|
| +LayoutTestBluetoothAdapterProvider::GetNoNameHeartRateAdapter() {
|
| + scoped_refptr<NiceMockBluetoothAdapter> adapter(GetEmptyAdapter());
|
| + std::unique_ptr<NiceMockBluetoothDevice> device(
|
| + GetHeartRateDevice(adapter.get(), /* device_name */ nullptr));
|
| +
|
| + // TODO(ortuno): Implement the rest of the service's characteristics
|
| + // See: http://crbug.com/529975
|
| +
|
| + device->AddMockService(GetGenericAccessService(device.get()));
|
| + device->AddMockService(GetHeartRateService(adapter.get(), device.get()));
|
| +
|
| + adapter->AddMockDevice(std::move(device));
|
| +
|
| + return adapter;
|
| +}
|
| +
|
| +// static
|
| +scoped_refptr<NiceMockBluetoothAdapter>
|
| LayoutTestBluetoothAdapterProvider::GetTwoHeartRateServicesAdapter() {
|
| scoped_refptr<NiceMockBluetoothAdapter> adapter(GetEmptyAdapter());
|
| std::unique_ptr<NiceMockBluetoothDevice> device(
|
| @@ -806,12 +846,13 @@ LayoutTestBluetoothAdapterProvider::GetUnconnectableDevice(
|
| // static
|
| std::unique_ptr<NiceMockBluetoothDevice>
|
| LayoutTestBluetoothAdapterProvider::GetHeartRateDevice(
|
| - MockBluetoothAdapter* adapter) {
|
| + MockBluetoothAdapter* adapter,
|
| + const char* device_name) {
|
| BluetoothDevice::UUIDList uuids;
|
| uuids.push_back(BluetoothUUID(kGenericAccessServiceUUID));
|
| uuids.push_back(BluetoothUUID(kHeartRateServiceUUID));
|
|
|
| - return GetConnectableDevice(adapter, "Heart Rate Device", uuids);
|
| + return GetConnectableDevice(adapter, device_name, uuids);
|
| }
|
|
|
| // Services
|
|
|