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

Unified Diff: device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc

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
Index: device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc
diff --git a/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc b/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc
index e5c5e3581312407d0dc7c7bea3c53f32d5b120c7..b5e6f8110b1f39a1029a5f12d6bcb641873c81b3 100644
--- a/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc
+++ b/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc
@@ -4,6 +4,8 @@
#include "device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/logging.h"
#include "base/macros.h"
@@ -38,10 +40,10 @@ class BluetoothAdvertisementServiceProviderImpl
bus_(bus),
delegate_(delegate),
type_(type),
- service_uuids_(service_uuids.Pass()),
- manufacturer_data_(manufacturer_data.Pass()),
- solicit_uuids_(solicit_uuids.Pass()),
- service_data_(service_data.Pass()),
+ service_uuids_(std::move(service_uuids)),
+ manufacturer_data_(std::move(manufacturer_data)),
+ solicit_uuids_(std::move(solicit_uuids)),
+ service_data_(std::move(service_data)),
weak_ptr_factory_(this) {
DCHECK(bus);
DCHECK(delegate);
@@ -116,7 +118,7 @@ class BluetoothAdvertisementServiceProviderImpl
scoped_ptr<dbus::ErrorResponse> error_response =
dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs,
"Expected 'ss'.");
- response_sender.Run(error_response.Pass());
+ response_sender.Run(std::move(error_response));
return;
}
@@ -127,7 +129,7 @@ class BluetoothAdvertisementServiceProviderImpl
dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs,
"No such interface: '" + interface_name + "'.");
- response_sender.Run(error_response.Pass());
+ response_sender.Run(std::move(error_response));
return;
}
@@ -168,11 +170,11 @@ class BluetoothAdvertisementServiceProviderImpl
dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs,
"No such property: '" + property_name + "'.");
- response_sender.Run(error_response.Pass());
+ response_sender.Run(std::move(error_response));
}
writer.CloseContainer(&variant_writer);
- response_sender.Run(response.Pass());
+ response_sender.Run(std::move(response));
}
// Called by dbus:: when the Bluetooth daemon fetches all properties of the
@@ -190,7 +192,7 @@ class BluetoothAdvertisementServiceProviderImpl
scoped_ptr<dbus::ErrorResponse> error_response =
dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs,
"Expected 's'.");
- response_sender.Run(error_response.Pass());
+ response_sender.Run(std::move(error_response));
return;
}
@@ -201,11 +203,11 @@ class BluetoothAdvertisementServiceProviderImpl
dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs,
"No such interface: '" + interface_name + "'.");
- response_sender.Run(error_response.Pass());
+ response_sender.Run(std::move(error_response));
return;
}
- response_sender.Run(CreateGetAllResponse(method_call).Pass());
+ response_sender.Run(CreateGetAllResponse(method_call));
}
// Called by dbus:: when a method is exported.
@@ -255,7 +257,7 @@ class BluetoothAdvertisementServiceProviderImpl
variant_writer.AppendArrayOfBytes(value.data(), value.size());
writer.CloseContainer(&variant_writer);
- response_sender.Run(response.Pass());
+ response_sender.Run(std::move(response));
}
void AppendArrayVariantOfStrings(dbus::MessageWriter* dict_writer,
@@ -413,8 +415,9 @@ BluetoothLEAdvertisementServiceProvider::Create(
scoped_ptr<ServiceData> service_data) {
if (!bluez::BluezDBusManager::Get()->IsUsingStub()) {
return make_scoped_ptr(new BluetoothAdvertisementServiceProviderImpl(
- bus, object_path, delegate, type, service_uuids.Pass(),
- manufacturer_data.Pass(), solicit_uuids.Pass(), service_data.Pass()));
+ bus, object_path, delegate, type, std::move(service_uuids),
+ std::move(manufacturer_data), std::move(solicit_uuids),
+ std::move(service_data)));
} else {
return make_scoped_ptr(
new FakeBluetoothLEAdvertisementServiceProvider(object_path, delegate));

Powered by Google App Engine
This is Rietveld 408576698