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

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

Issue 2014473002: bluetooth: Web Bluetooth can filter by empty device names, doesn't leak MACs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bt-GetNameOrEmpty-
Patch Set: Merge Created 4 years, 5 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 ca050ee958a9bee878a492f36a39e18c8b55c654..03c2340edf19cc26df9fe7d69ac4f6d46bd8b480 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
@@ -160,6 +160,8 @@ LayoutTestBluetoothAdapterProvider::GetBluetoothAdapter(
return GetMissingCharacteristicHeartRateAdapter();
if (fake_adapter_name == "HeartRateAdapter")
return GetHeartRateAdapter();
+ if (fake_adapter_name == "UnnamedHeartRateAdapter")
+ return GetUnnamedHeartRateAdapter();
if (fake_adapter_name == "TwoHeartRateServicesAdapter")
return GetTwoHeartRateServicesAdapter();
if (fake_adapter_name == "DisconnectingHeartRateAdapter")
@@ -440,6 +442,24 @@ LayoutTestBluetoothAdapterProvider::GetHeartRateAdapter() {
// static
scoped_refptr<NiceMockBluetoothAdapter>
+LayoutTestBluetoothAdapterProvider::GetUnnamedHeartRateAdapter() {
+ scoped_refptr<NiceMockBluetoothAdapter> adapter(GetEmptyAdapter());
+ std::unique_ptr<NiceMockBluetoothDevice> device(
+ GetHeartRateDevice(adapter.get(), ""));
ortuno 2016/07/21 17:42:29 Well this is not really an Unnamed device is more
scheib 2016/07/30 02:38:14 Done - created unnamed and empty named versions.
+
+ // 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(
@@ -720,12 +740,13 @@ LayoutTestBluetoothAdapterProvider::GetUnconnectableDevice(
// static
std::unique_ptr<NiceMockBluetoothDevice>
LayoutTestBluetoothAdapterProvider::GetHeartRateDevice(
- MockBluetoothAdapter* adapter) {
+ MockBluetoothAdapter* adapter,
+ const std::string& 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

Powered by Google App Engine
This is Rietveld 408576698