Index: device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.cc |
diff --git a/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.cc b/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.cc |
index 36ae7efdd2d7d84ead293313a044c3596d5de1e2..53cc7f1c5ffb3c2790e071373a7c35ee849551b6 100644 |
--- a/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.cc |
+++ b/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.cc |
@@ -5,6 +5,7 @@ |
#include "device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.h" |
#include <stddef.h> |
+#include <utility> |
#include "base/bind.h" |
#include "base/logging.h" |
@@ -139,7 +140,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
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; |
} |
@@ -150,7 +151,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
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; |
} |
@@ -188,7 +189,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
"No such property: '" + property_name + "'."); |
} |
- response_sender.Run(response.Pass()); |
+ response_sender.Run(std::move(response)); |
} |
// Called by dbus:: when the Bluetooth daemon sets a single property of the |
@@ -210,7 +211,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
scoped_ptr<dbus::ErrorResponse> error_response = |
dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs, |
"Expected 'ssv'."); |
- response_sender.Run(error_response.Pass()); |
+ response_sender.Run(std::move(error_response)); |
return; |
} |
@@ -221,7 +222,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
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; |
} |
@@ -240,7 +241,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
scoped_ptr<dbus::ErrorResponse> error_response = |
dbus::ErrorResponse::FromMethodCall(method_call, error_name, |
error_message); |
- response_sender.Run(error_response.Pass()); |
+ response_sender.Run(std::move(error_response)); |
return; |
} |
@@ -252,7 +253,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
dbus::ErrorResponse::FromMethodCall( |
method_call, kErrorInvalidArgs, |
"Property '" + property_name + "' has type 'ay'."); |
- response_sender.Run(error_response.Pass()); |
+ response_sender.Run(std::move(error_response)); |
return; |
} |
@@ -283,7 +284,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
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; |
} |
@@ -294,7 +295,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
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; |
} |
@@ -358,7 +359,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
writer.CloseContainer(&array_writer); |
- response_sender.Run(response.Pass()); |
+ response_sender.Run(std::move(response)); |
} |
// Called by the Delegate in response to a successful method call to get the |
@@ -376,7 +377,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
variant_writer.AppendArrayOfBytes(value.data(), value.size()); |
writer.CloseContainer(&variant_writer); |
- response_sender.Run(response.Pass()); |
+ response_sender.Run(std::move(response)); |
} |
// Called by the Delegate in response to a successful method call to set the |
@@ -395,7 +396,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
scoped_ptr<dbus::ErrorResponse> error_response = |
dbus::ErrorResponse::FromMethodCall( |
method_call, kErrorFailed, "Failed to get/set descriptor value."); |
- response_sender.Run(error_response.Pass()); |
+ response_sender.Run(std::move(error_response)); |
} |
// Origin thread (i.e. the UI thread in production). |