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

Unified Diff: chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc

Issue 1825263002: [Extensions] Convert APIs to use movable types [1] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Antony's Created 4 years, 9 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: chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc
diff --git a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc
index 2b03d8df2c0886c542b40af30fea903160480ff5..7ae127b611185e5c3367bb95a04dd1b66905eecb 100644
--- a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc
+++ b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc
@@ -134,25 +134,25 @@ void DoWorkCallback(const base::Callback<bool()>& callback) {
scoped_ptr<device::BluetoothAdvertisement::ManufacturerData>
CreateManufacturerData(
- std::vector<linked_ptr<apibtle::ManufacturerData>>* manufacturer_data) {
+ std::vector<apibtle::ManufacturerData>* manufacturer_data) {
scoped_ptr<device::BluetoothAdvertisement::ManufacturerData> created_data(
new device::BluetoothAdvertisement::ManufacturerData());
for (const auto& it : *manufacturer_data) {
- std::vector<uint8_t> data(it->data.size());
- std::copy(it->data.begin(), it->data.end(), data.begin());
- (*created_data)[it->id] = data;
+ std::vector<uint8_t> data(it.data.size());
+ std::copy(it.data.begin(), it.data.end(), data.begin());
+ (*created_data)[it.id] = data;
}
return created_data;
}
scoped_ptr<device::BluetoothAdvertisement::ServiceData> CreateServiceData(
- std::vector<linked_ptr<apibtle::ServiceData>>* service_data) {
+ std::vector<apibtle::ServiceData>* service_data) {
scoped_ptr<device::BluetoothAdvertisement::ServiceData> created_data(
new device::BluetoothAdvertisement::ServiceData());
for (const auto& it : *service_data) {
- std::vector<uint8_t> data(it->data.size());
- std::copy(it->data.begin(), it->data.end(), data.begin());
- (*created_data)[it->uuid] = data;
+ std::vector<uint8_t> data(it.data.size());
+ std::copy(it.data.begin(), it.data.end(), data.begin());
+ (*created_data)[it.uuid] = data;
}
return created_data;
}
@@ -434,11 +434,8 @@ bool BluetoothLowEnergyGetCharacteristicsFunction::DoWork() {
// apibtle::GetCharacteristics::Result::Create as it doesn't convert lists of
// enums correctly.
scoped_ptr<base::ListValue> result(new base::ListValue());
- for (BluetoothLowEnergyEventRouter::CharacteristicList::iterator iter =
- characteristic_list.begin();
- iter != characteristic_list.end();
- ++iter)
- result->Append(apibtle::CharacteristicToValue(iter->get()).release());
+ for (apibtle::Characteristic& characteristic : characteristic_list)
+ result->Append(apibtle::CharacteristicToValue(&characteristic));
SetResult(result.release());
SendResponse(true);
@@ -546,11 +543,8 @@ bool BluetoothLowEnergyGetDescriptorsFunction::DoWork() {
// apibtle::GetDescriptors::Result::Create as it doesn't convert lists of
// enums correctly.
scoped_ptr<base::ListValue> result(new base::ListValue());
- for (BluetoothLowEnergyEventRouter::DescriptorList::iterator iter =
- descriptor_list.begin();
- iter != descriptor_list.end();
- ++iter)
- result->Append(apibtle::DescriptorToValue(iter->get()).release());
+ for (apibtle::Descriptor& descriptor : descriptor_list)
+ result->Append(apibtle::DescriptorToValue(&descriptor));
SetResult(result.release());
SendResponse(true);

Powered by Google App Engine
This is Rietveld 408576698