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

Unified Diff: device/bluetooth/bluetooth_advertisement.h

Issue 1544323002: Convert Pass()→std::move() in //device (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
« no previous file with comments | « device/bluetooth/bluetooth_adapter_unittest.cc ('k') | device/bluetooth/bluetooth_advertisement_bluez.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_advertisement.h
diff --git a/device/bluetooth/bluetooth_advertisement.h b/device/bluetooth/bluetooth_advertisement.h
index 5dcc1f07d179a35f0c9a60667c5a8cd333a45e25..4f795195dca5c668403fa4452ae78ab39a7d0628 100644
--- a/device/bluetooth/bluetooth_advertisement.h
+++ b/device/bluetooth/bluetooth_advertisement.h
@@ -6,9 +6,9 @@
#define DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_H_
#include <stdint.h>
-
#include <map>
#include <string>
+#include <utility>
#include <vector>
#include "base/callback.h"
@@ -60,24 +60,24 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdvertisement
~Data();
AdvertisementType type() { return type_; }
- scoped_ptr<UUIDList> service_uuids() { return service_uuids_.Pass(); }
+ scoped_ptr<UUIDList> service_uuids() { return std::move(service_uuids_); }
scoped_ptr<ManufacturerData> manufacturer_data() {
- return manufacturer_data_.Pass();
+ return std::move(manufacturer_data_);
}
- scoped_ptr<UUIDList> solicit_uuids() { return solicit_uuids_.Pass(); }
- scoped_ptr<ServiceData> service_data() { return service_data_.Pass(); }
+ scoped_ptr<UUIDList> solicit_uuids() { return std::move(solicit_uuids_); }
+ scoped_ptr<ServiceData> service_data() { return std::move(service_data_); }
void set_service_uuids(scoped_ptr<UUIDList> service_uuids) {
- service_uuids_ = service_uuids.Pass();
+ service_uuids_ = std::move(service_uuids);
}
void set_manufacturer_data(scoped_ptr<ManufacturerData> manufacturer_data) {
- manufacturer_data_ = manufacturer_data.Pass();
+ manufacturer_data_ = std::move(manufacturer_data);
}
void set_solicit_uuids(scoped_ptr<UUIDList> solicit_uuids) {
- solicit_uuids_ = solicit_uuids.Pass();
+ solicit_uuids_ = std::move(solicit_uuids);
}
void set_service_data(scoped_ptr<ServiceData> service_data) {
- service_data_ = service_data.Pass();
+ service_data_ = std::move(service_data);
}
void set_include_tx_power(bool include_tx_power) {
« no previous file with comments | « device/bluetooth/bluetooth_adapter_unittest.cc ('k') | device/bluetooth/bluetooth_advertisement_bluez.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698