content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc - Issue 1898643002: Refactor device::BluetoothGattXXX classes to split into remote/local.

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

Issue 1898643002: Refactor device::BluetoothGattXXX classes to split into remote/local. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

« components/proximity_auth/ble/bluetooth_low_energy_characteristics_finder.h ('K') | « content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h ('k') | device/BUILD.gn » ('j') | device/bluetooth/bluetooth_gatt_characteristic.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 1aa2532f31cb2a533044b47782d3084c3051b81e..8d8f8eb4361382459fdaa528f5e49df15e32d269 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

@@ -29,8 +29,8 @@

using base::StringPiece;

using device::BluetoothAdapter;

using device::BluetoothDevice;

-using device::BluetoothGattCharacteristic;

-using device::BluetoothGattService;

+using device::BluetoothRemoteGattCharacteristic;

+using device::BluetoothRemoteGattService;

using device::BluetoothUUID;

using device::MockBluetoothAdapter;

using device::MockBluetoothDevice;

@@ -459,7 +459,7 @@ LayoutTestBluetoothAdapterProvider::GetDelayedServicesDiscoveryAdapter() {

ON_CALL(*device, GetGattServices())

.WillByDefault(Invoke([adapter_ptr, device_ptr] {

- std::vector<BluetoothGattService*> services =

+ std::vector<BluetoothRemoteGattService*> services =

device_ptr->GetMockServices();

if (services.size() > 0) {

@@ -556,11 +556,11 @@ LayoutTestBluetoothAdapterProvider::GetFailingGATTOperationsAdapter() {

std::unique_ptr<NiceMockBluetoothGattService> service(

GetBaseGATTService(device.get(), errorsServiceUUID));

- for (int error = BluetoothGattService::GATT_ERROR_UNKNOWN;

- error <= BluetoothGattService::GATT_ERROR_NOT_SUPPORTED; error++) {

+ for (int error = BluetoothRemoteGattService::GATT_ERROR_UNKNOWN;

+ error <= BluetoothRemoteGattService::GATT_ERROR_NOT_SUPPORTED; error++) {

service->AddMockCharacteristic(GetErrorCharacteristic(

service.get(),

- static_cast<BluetoothGattService::GattErrorCode>(error)));

+ static_cast<BluetoothRemoteGattService::GattErrorCode>(error)));

}

device->AddMockService(std::move(service));

@@ -731,8 +731,8 @@ LayoutTestBluetoothAdapterProvider::GetBlacklistTestService(

blacklist_exclude_reads_characteristic(GetBaseGATTCharacteristic(

"Excluded Reads Characteristic", blacklist_test_service.get(),

kBlacklistExcludeReadsCharacteristicUUID,

- BluetoothGattCharacteristic::PROPERTY_READ |

- BluetoothGattCharacteristic::PROPERTY_WRITE));

+ BluetoothRemoteGattCharacteristic::PROPERTY_READ |

+ BluetoothRemoteGattCharacteristic::PROPERTY_WRITE));

// Crash if ReadRemoteCharacteristic called. Not using GoogleMock's Expect

// because this is used in layout tests that may not report a mock expectation

@@ -740,8 +740,8 @@ LayoutTestBluetoothAdapterProvider::GetBlacklistTestService(

ON_CALL(*blacklist_exclude_reads_characteristic,

ReadRemoteCharacteristic(_, _))

.WillByDefault(

- Invoke([](const BluetoothGattCharacteristic::ValueCallback&,

- const BluetoothGattCharacteristic::ErrorCallback&) {

+ Invoke([](const BluetoothRemoteGattCharacteristic::ValueCallback&,

+ const BluetoothRemoteGattCharacteristic::ErrorCallback&) {

NOTREACHED();

}));

@@ -766,15 +766,16 @@ LayoutTestBluetoothAdapterProvider::GetDeviceInformationService(

std::unique_ptr<NiceMockBluetoothGattCharacteristic> serial_number_string(

GetBaseGATTCharacteristic(

"Serial Number String", device_information.get(),

- kSerialNumberStringUUID, BluetoothGattCharacteristic::PROPERTY_READ));

+ kSerialNumberStringUUID,

+ BluetoothRemoteGattCharacteristic::PROPERTY_READ));

// Crash if ReadRemoteCharacteristic called. Not using GoogleMock's Expect

// because this is used in layout tests that may not report a mock expectation

// error correctly as a layout test failure.

ON_CALL(*serial_number_string, ReadRemoteCharacteristic(_, _))

.WillByDefault(

- Invoke([](const BluetoothGattCharacteristic::ValueCallback&,

- const BluetoothGattCharacteristic::ErrorCallback&) {

+ Invoke([](const BluetoothRemoteGattCharacteristic::ValueCallback&,

+ const BluetoothRemoteGattCharacteristic::ErrorCallback&) {

NOTREACHED();

}));

@@ -794,8 +795,8 @@ LayoutTestBluetoothAdapterProvider::GetGenericAccessService(

std::unique_ptr<NiceMockBluetoothGattCharacteristic> device_name(

GetBaseGATTCharacteristic(

"Device Name", generic_access.get(), kDeviceNameUUID,

- BluetoothGattCharacteristic::PROPERTY_READ |

- BluetoothGattCharacteristic::PROPERTY_WRITE));

+ BluetoothRemoteGattCharacteristic::PROPERTY_READ |

+ BluetoothRemoteGattCharacteristic::PROPERTY_WRITE));

// Read response.

std::string device_name_str = device->GetDeviceName();

@@ -817,8 +818,8 @@ LayoutTestBluetoothAdapterProvider::GetGenericAccessService(

peripheral_privacy_flag(GetBaseGATTCharacteristic(

"Peripheral Privacy Flag", generic_access.get(),

kPeripheralPrivacyFlagUUID,

- BluetoothGattCharacteristic::PROPERTY_READ |

- BluetoothGattCharacteristic::PROPERTY_WRITE));

+ BluetoothRemoteGattCharacteristic::PROPERTY_READ |

+ BluetoothRemoteGattCharacteristic::PROPERTY_WRITE));

// Read response.

std::vector<uint8_t> value(1);

@@ -833,7 +834,7 @@ LayoutTestBluetoothAdapterProvider::GetGenericAccessService(

ON_CALL(*peripheral_privacy_flag, WriteRemoteCharacteristic(_, _, _))

.WillByDefault(

Invoke([](const std::vector<uint8_t>&, const base::Closure&,

- const BluetoothGattCharacteristic::ErrorCallback&) {

+ const BluetoothRemoteGattCharacteristic::ErrorCallback&) {

NOTREACHED();

}));

@@ -853,9 +854,9 @@ LayoutTestBluetoothAdapterProvider::GetHeartRateService(

// Heart Rate Measurement

std::unique_ptr<NiceMockBluetoothGattCharacteristic> heart_rate_measurement(

- GetBaseGATTCharacteristic("Heart Rate Measurement", heart_rate.get(),

- kHeartRateMeasurementUUID,

- BluetoothGattCharacteristic::PROPERTY_NOTIFY));

+ GetBaseGATTCharacteristic(

+ "Heart Rate Measurement", heart_rate.get(), kHeartRateMeasurementUUID,

+ BluetoothRemoteGattCharacteristic::PROPERTY_NOTIFY));

NiceMockBluetoothGattCharacteristic* measurement_ptr =

heart_rate_measurement.get();

@@ -878,8 +879,8 @@ LayoutTestBluetoothAdapterProvider::GetHeartRateService(

std::unique_ptr<NiceMockBluetoothGattCharacteristic>

body_sensor_location_chest(GetBaseGATTCharacteristic(

"Body Sensor Location Chest", heart_rate.get(), kBodySensorLocation,

- BluetoothGattCharacteristic::PROPERTY_READ));

- BluetoothGattCharacteristic* location_chest_ptr =

+ BluetoothRemoteGattCharacteristic::PROPERTY_READ));

+ BluetoothRemoteGattCharacteristic* location_chest_ptr =

body_sensor_location_chest.get();

ON_CALL(*body_sensor_location_chest, ReadRemoteCharacteristic(_, _))

@@ -900,8 +901,8 @@ LayoutTestBluetoothAdapterProvider::GetHeartRateService(

std::unique_ptr<NiceMockBluetoothGattCharacteristic>

body_sensor_location_wrist(GetBaseGATTCharacteristic(

"Body Sensor Location Wrist", heart_rate.get(), kBodySensorLocation,

- BluetoothGattCharacteristic::PROPERTY_READ));

- BluetoothGattCharacteristic* location_wrist_ptr =

+ BluetoothRemoteGattCharacteristic::PROPERTY_READ));

+ BluetoothRemoteGattCharacteristic* location_wrist_ptr =

body_sensor_location_wrist.get();

ON_CALL(*body_sensor_location_wrist, ReadRemoteCharacteristic(_, _))

@@ -933,7 +934,7 @@ LayoutTestBluetoothAdapterProvider::GetBaseGATTCharacteristic(

const std::string& identifier,

MockBluetoothGattService* service,

const std::string& uuid,

- BluetoothGattCharacteristic::Properties properties) {

+ BluetoothRemoteGattCharacteristic::Properties properties) {

return base::WrapUnique(new NiceMockBluetoothGattCharacteristic(

service, identifier, BluetoothUUID(uuid), false /* is_local */,

properties, NULL /* permissions */));

@@ -943,16 +944,16 @@ LayoutTestBluetoothAdapterProvider::GetBaseGATTCharacteristic(

std::unique_ptr<NiceMockBluetoothGattCharacteristic>

LayoutTestBluetoothAdapterProvider::GetErrorCharacteristic(

MockBluetoothGattService* service,

- BluetoothGattService::GattErrorCode error_code) {

+ BluetoothRemoteGattService::GattErrorCode error_code) {

uint32_t error_alias = error_code + 0xA1; // Error UUIDs start at 0xA1.

std::unique_ptr<NiceMockBluetoothGattCharacteristic> characteristic(

GetBaseGATTCharacteristic(

// Use the UUID to generate unique identifiers.

"Error Characteristic " + errorUUID(error_alias), service,

errorUUID(error_alias),

- BluetoothGattCharacteristic::PROPERTY_READ |

- BluetoothGattCharacteristic::PROPERTY_WRITE |

- BluetoothGattCharacteristic::PROPERTY_INDICATE));

+ BluetoothRemoteGattCharacteristic::PROPERTY_READ |

+ BluetoothRemoteGattCharacteristic::PROPERTY_WRITE |

+ BluetoothRemoteGattCharacteristic::PROPERTY_INDICATE));

// Read response.

ON_CALL(*characteristic, ReadRemoteCharacteristic(_, _))