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

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

Issue 1403723004: bluetooth: Implement BluetoothCharacteristicProperties (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-query-cache
Patch Set: Address scheib's comments Created 5 years, 2 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 606f3754383d64f56a9c17a670ee9cdd6c3b3866..70a1f0d5fb29c3cc2be5e94606a4fc62b6b42f32 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
@@ -158,6 +158,9 @@ class LayoutTestBluetoothAdapterProvider {
// - Mock Functions:
// - Read: Calls success callback with device's name.
// - Write: Calls success callback.
+ // - GetProperties: Returns
+ // BluetoothGattCharacteristic::PROPERTY_READ |
+ // BluetoothGattCharacteristic::PROPERTY_WRITE
static scoped_refptr<testing::NiceMock<device::MockBluetoothAdapter>>
GetGenericAccessAdapter();
@@ -172,8 +175,12 @@ class LayoutTestBluetoothAdapterProvider {
// - Mock Functions:
// - Read: Calls GattCharacteristicValueChanged and success
// callback with [1] which corresponds to chest.
+ // - GetProperties: Returns
+ // BluetoothGattCharacteristic::PROPERTY_READ
// - Heart Rate Measurement Characteristic:
// - Mock Functions:
+ // - GetProperties: Returns
+ // BluetoothGattCharacteristic::PROPERTY_NOTIFY
// - StartNotifySession: Sets a timer to call
// GattCharacteristicValueChanged every 10ms and calls success
// callback with a
@@ -211,6 +218,10 @@ class LayoutTestBluetoothAdapterProvider {
// service: ErrorsService. This service contains a characteristic for each
// type of GATT Error that can be thrown. Trying to write or read from these
// characteristics results in the corresponding error being returned.
+ // GetProperties returns the following for all characteristics:
+ // (BluetoothGattCharacteristic::PROPERTY_READ |
+ // BluetoothGattCharacteristic::PROPERTY_WRITE |
+ // BluetoothGattCharacteristic::PROPERTY_INDICATE)
// Internal Structure:
// - ErrorsDevice
// - ErrorsService errorUUID(0xA0)
@@ -414,8 +425,10 @@ class LayoutTestBluetoothAdapterProvider {
// - GetPermissions:
// Returns: NULL
static scoped_ptr<testing::NiceMock<device::MockBluetoothGattCharacteristic>>
- GetBaseGATTCharacteristic(device::MockBluetoothGattService* service,
- const std::string& uuid);
+ GetBaseGATTCharacteristic(
+ device::MockBluetoothGattService* service,
+ const std::string& uuid,
+ device::BluetoothGattCharacteristic::Properties properties);
// |ErrorCharacteristic|(service, error_type)
// Inherits from BaseCharacteristic(service, errorUUID(error_type + 0xA1))

Powered by Google App Engine
This is Rietveld 408576698