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

Unified Diff: components/arc/test/fake_bluetooth_instance.h

Issue 2511253002: arc: bluetooth: enable use_new_wrapper_types for bluetooth.mojom (Closed)
Patch Set: Rebase again Created 4 years, 1 month 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: components/arc/test/fake_bluetooth_instance.h
diff --git a/components/arc/test/fake_bluetooth_instance.h b/components/arc/test/fake_bluetooth_instance.h
index 3abd80b8c0b40e05186552439ea48701e4cf906f..21211209d9a3400fdce6a9aaa8ba91e9b8603afc 100644
--- a/components/arc/test/fake_bluetooth_instance.h
+++ b/components/arc/test/fake_bluetooth_instance.h
@@ -24,20 +24,20 @@ class FakeBluetoothInstance : public mojom::BluetoothInstance {
class GattDBResult {
public:
GattDBResult(mojom::BluetoothAddressPtr&& remote_addr,
- mojo::Array<mojom::BluetoothGattDBElementPtr>&& db);
+ std::vector<mojom::BluetoothGattDBElementPtr>&& db);
~GattDBResult();
const mojom::BluetoothAddressPtr& remote_addr() const {
return remote_addr_;
}
- const mojo::Array<mojom::BluetoothGattDBElementPtr>& db() const {
+ const std::vector<mojom::BluetoothGattDBElementPtr>& db() const {
return db_;
}
private:
mojom::BluetoothAddressPtr remote_addr_;
- mojo::Array<mojom::BluetoothGattDBElementPtr> db_;
+ std::vector<mojom::BluetoothGattDBElementPtr> db_;
DISALLOW_COPY_AND_ASSIGN(GattDBResult);
};
@@ -47,21 +47,21 @@ class FakeBluetoothInstance : public mojom::BluetoothInstance {
LEDeviceFoundData(
mojom::BluetoothAddressPtr&& addr,
int32_t rssi,
- mojo::Array<mojom::BluetoothAdvertisingDataPtr>&& adv_data);
+ std::vector<mojom::BluetoothAdvertisingDataPtr>&& adv_data);
~LEDeviceFoundData();
const mojom::BluetoothAddressPtr& addr() const { return addr_; }
int32_t rssi() const { return rssi_; }
- const mojo::Array<mojom::BluetoothAdvertisingDataPtr>& adv_data() const {
+ const std::vector<mojom::BluetoothAdvertisingDataPtr>& adv_data() const {
return adv_data_;
}
private:
mojom::BluetoothAddressPtr addr_;
int32_t rssi_;
- mojo::Array<mojom::BluetoothAdvertisingDataPtr> adv_data_;
+ std::vector<mojom::BluetoothAdvertisingDataPtr> adv_data_;
DISALLOW_COPY_AND_ASSIGN(LEDeviceFoundData);
};
@@ -73,13 +73,13 @@ class FakeBluetoothInstance : public mojom::BluetoothInstance {
void Init(mojom::BluetoothHostPtr host_ptr) override;
void OnAdapterProperties(
mojom::BluetoothStatus status,
- mojo::Array<mojom::BluetoothPropertyPtr> properties) override;
+ std::vector<mojom::BluetoothPropertyPtr> properties) override;
void OnRemoteDeviceProperties(
mojom::BluetoothStatus status,
mojom::BluetoothAddressPtr address,
- mojo::Array<mojom::BluetoothPropertyPtr> properties) override;
+ std::vector<mojom::BluetoothPropertyPtr> properties) override;
void OnDeviceFound(
- mojo::Array<mojom::BluetoothPropertyPtr> properties) override;
+ std::vector<mojom::BluetoothPropertyPtr> properties) override;
void OnDiscoveryStateChanged(mojom::BluetoothDiscoveryState state) override;
void OnBondStateChanged(mojom::BluetoothStatus status,
mojom::BluetoothAddressPtr remote_addr,
@@ -90,7 +90,7 @@ class FakeBluetoothInstance : public mojom::BluetoothInstance {
void OnLEDeviceFound(
mojom::BluetoothAddressPtr addr,
int32_t rssi,
- mojo::Array<mojom::BluetoothAdvertisingDataPtr> adv_data) override;
+ std::vector<mojom::BluetoothAdvertisingDataPtr> adv_data) override;
void OnLEConnectionStateChange(mojom::BluetoothAddressPtr remote_addr,
bool connected) override;
void OnLEDeviceAddressChange(mojom::BluetoothAddressPtr old_addr,
@@ -98,19 +98,19 @@ class FakeBluetoothInstance : public mojom::BluetoothInstance {
void OnSearchComplete(mojom::BluetoothAddressPtr remote_addr,
mojom::BluetoothGattStatus status) override;
void OnGetGattDB(mojom::BluetoothAddressPtr remote_addr,
- mojo::Array<mojom::BluetoothGattDBElementPtr> db) override;
+ std::vector<mojom::BluetoothGattDBElementPtr> db) override;
void OnServicesRemoved(mojom::BluetoothAddressPtr remote_addr,
uint16_t start_handle,
uint16_t end_handle) override;
void OnServicesAdded(
mojom::BluetoothAddressPtr remote_addr,
- mojo::Array<mojom::BluetoothGattDBElementPtr> db) override;
+ std::vector<mojom::BluetoothGattDBElementPtr> db) override;
void OnGattNotify(mojom::BluetoothAddressPtr remote_addr,
mojom::BluetoothGattServiceIDPtr service_id,
mojom::BluetoothGattIDPtr char_id,
bool is_notify,
- mojo::Array<uint8_t> value) override;
+ const std::vector<uint8_t>& value) override;
void RequestGattRead(mojom::BluetoothAddressPtr address,
int32_t attribute_handle,
@@ -121,16 +121,16 @@ class FakeBluetoothInstance : public mojom::BluetoothInstance {
void RequestGattWrite(mojom::BluetoothAddressPtr address,
int32_t attribute_handle,
int32_t offset,
- mojo::Array<uint8_t> value,
+ const std::vector<uint8_t>& value,
const RequestGattWriteCallback& callback) override;
void OnGetSdpRecords(
mojom::BluetoothStatus status,
mojom::BluetoothAddressPtr remove_addr,
const device::BluetoothUUID& target_uuid,
- mojo::Array<mojom::BluetoothSdpRecordPtr> records) override;
+ std::vector<mojom::BluetoothSdpRecordPtr> records) override;
- const std::vector<mojo::Array<mojom::BluetoothPropertyPtr>>&
+ const std::vector<std::vector<mojom::BluetoothPropertyPtr>>&
device_found_data() const {
return device_found_data_;
}
@@ -145,7 +145,7 @@ class FakeBluetoothInstance : public mojom::BluetoothInstance {
}
private:
- std::vector<mojo::Array<mojom::BluetoothPropertyPtr>> device_found_data_;
+ std::vector<std::vector<mojom::BluetoothPropertyPtr>> device_found_data_;
std::vector<std::unique_ptr<LEDeviceFoundData>> le_device_found_data_;
std::vector<std::unique_ptr<GattDBResult>> gatt_db_result_;
« no previous file with comments | « components/arc/bluetooth/bluetooth_type_converters_unittest.cc ('k') | components/arc/test/fake_bluetooth_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698