Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2144)

Unified Diff: content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc

Issue 1666003002: bluetooth: Add Web Bluetooth blacklist checks to requestDevice. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bt-blacklist-
Patch Set: fix test expectation with updated error string Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 4e62b295b9833ca26a3ab78ee1af89416eba5792..cced25f3d6d64638ad1772868956ff37e20becf3 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
@@ -64,6 +64,7 @@ const char kBatteryServiceUUID[] = "180f";
const char kGenericAccessServiceUUID[] = "1800";
const char kGlucoseServiceUUID[] = "1808";
const char kHeartRateServiceUUID[] = "180d";
+const char kHumanInterfaceDeviceServiceUUID[] = "1812";
const char kTxPowerServiceUUID[] = "1804";
const char kHeartRateMeasurementUUID[] = "2a37";
const char kBodySensorLocation[] = "2a38";
@@ -151,6 +152,8 @@ LayoutTestBluetoothAdapterProvider::GetBluetoothAdapter(
return GetMissingCharacteristicHeartRateAdapter();
if (fake_adapter_name == "HeartRateAdapter")
return GetHeartRateAdapter();
+ if (fake_adapter_name == "HeartRateAndHIDAdapter")
+ return GetHeartRateAndHIDAdapter();
if (fake_adapter_name == "FailingConnectionsAdapter")
return GetFailingConnectionsAdapter();
if (fake_adapter_name == "FailingGATTOperationsAdapter")
@@ -486,6 +489,27 @@ LayoutTestBluetoothAdapterProvider::GetHeartRateAdapter() {
// static
scoped_refptr<NiceMockBluetoothAdapter>
+LayoutTestBluetoothAdapterProvider::GetHeartRateAndHIDAdapter() {
+ scoped_refptr<NiceMockBluetoothAdapter> adapter(GetEmptyAdapter());
+
+ BluetoothDevice::UUIDList uuids;
+ uuids.push_back(BluetoothUUID(kHeartRateServiceUUID));
+ uuids.push_back(BluetoothUUID(kHumanInterfaceDeviceServiceUUID));
+
+ scoped_ptr<NiceMockBluetoothDevice> device(
+ GetConnectableDevice(adapter.get(), "Heart Rate And HID Device", uuids));
+
+ device->AddMockService(GetGenericAccessService(adapter.get(), device.get()));
+ device->AddMockService(GetHeartRateService(adapter.get(), device.get()));
+ device->AddMockService(
+ GetBaseGATTService(device.get(), kHumanInterfaceDeviceServiceUUID));
+ adapter->AddMockDevice(std::move(device));
+
+ return adapter;
+}
+
+// static
+scoped_refptr<NiceMockBluetoothAdapter>
LayoutTestBluetoothAdapterProvider::GetFailingConnectionsAdapter() {
scoped_refptr<NiceMockBluetoothAdapter> adapter(GetEmptyAdapter());

Powered by Google App Engine
This is Rietveld 408576698