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

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

Issue 1697873002: bluetooth: Test Web Bluetooth getCharacteristic calls against blacklist. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bt-blacklist-integration-
Patch Set: 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.h
diff --git a/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h b/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h
index 2beaf6f3bfd7be38f04e74c449605e2734a61fad..f591b1b1fbbac2c9696041a6ec6545458043618a 100644
--- a/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h
+++ b/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h
@@ -213,6 +213,8 @@ class LayoutTestBluetoothAdapterProvider {
// - Heart Rate UUID (0x180d)
// - Human Interface Device UUID (0x1812) (a blacklisted service)
// - Services:
+ // - Device Information Service - Characteristics as described in
ortuno 2016/02/23 22:37:59 The services in the device should match the UUIDs
scheib 2016/02/24 19:51:29 Done.
+ // GetDeviceInformationService.
// - Generic Access Service - Characteristics as described in
// GetGenericAccessService.
// - Heart Rate Service - Characteristics as described in
@@ -451,6 +453,17 @@ class LayoutTestBluetoothAdapterProvider {
GetBaseGATTService(device::MockBluetoothDevice* device,
const std::string& uuid);
+ // |GetDeviceInformationService|
+ // Internal Structure:
+ // - Characteristics:
+ // - Serial Number String: (a blacklisted characteristic)
+ // - Mock Functions:
+ // - Read: Fails test.
+ // - GetProperties: Returns
+ // BluetoothGattCharacteristic::PROPERTY_READ
+ static scoped_ptr<testing::NiceMock<device::MockBluetoothGattService>>
+ GetDeviceInformationService(device::MockBluetoothDevice* device);
+
// |GenericAccessService|
// Internal Structure:
// - Characteristics:
@@ -462,8 +475,7 @@ class LayoutTestBluetoothAdapterProvider {
// BluetoothGattCharacteristic::PROPERTY_READ |
// BluetoothGattCharacteristic::PROPERTY_WRITE
static scoped_ptr<testing::NiceMock<device::MockBluetoothGattService>>
- GetGenericAccessService(device::MockBluetoothAdapter* adapter,
- device::MockBluetoothDevice* device);
+ GetGenericAccessService(device::MockBluetoothDevice* device);
// |HeartRateService|
// Internal Structure:

Powered by Google App Engine
This is Rietveld 408576698