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

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: move glucose UUID in code as well 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 41d0bfd44e85a0fb39a3c2f825f9b2a2318b5d52..3b7d328295bf479a507a899a4132bd09a8cff070 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,10 +213,13 @@ class LayoutTestBluetoothAdapterProvider {
// Internal Structure:
// - |ConnectableDevice|(adapter, "Heart Rate And HID Device", uuids)
// - UUIDs:
+ // - Device Information UUID (0x180a)
// - Generic Access UUID (0x1800)
// - Heart Rate UUID (0x180d)
// - Human Interface Device UUID (0x1812) (a blacklisted service)
// - Services:
+ // - Device Information Service - Characteristics as described in
+ // GetDeviceInformationService.
// - Generic Access Service - Characteristics as described in
// GetGenericAccessService.
// - Heart Rate Service - Characteristics as described in
@@ -382,8 +385,8 @@ class LayoutTestBluetoothAdapterProvider {
// "00:00:00:00:00:02")
// UUIDs added:
// - Generic Access (0x1800)
- // - Tx Power (0x1804)
// - Glucose UUID (0x1808)
+ // - Tx Power (0x1804)
// Services added:
// None.
static scoped_ptr<testing::NiceMock<device::MockBluetoothDevice>>
@@ -456,6 +459,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:
@@ -467,8 +481,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