| Index: chromeos/dbus/bluetooth_gatt_descriptor_service_provider.cc
|
| diff --git a/chromeos/dbus/bluetooth_gatt_descriptor_service_provider.cc b/chromeos/dbus/bluetooth_gatt_descriptor_service_provider.cc
|
| index 59d80518d07fe01628c387e760be7bcfc59be421..ac8373e2953f6e0e3be3edacc4cae37ce3687cbb 100644
|
| --- a/chromeos/dbus/bluetooth_gatt_descriptor_service_provider.cc
|
| +++ b/chromeos/dbus/bluetooth_gatt_descriptor_service_provider.cc
|
| @@ -142,7 +142,7 @@ class BluetoothGattDescriptorServiceProviderImpl
|
| scoped_ptr<dbus::ErrorResponse> error_response =
|
| dbus::ErrorResponse::FromMethodCall(
|
| method_call, kErrorInvalidArgs, "Expected 'ss'.");
|
| - response_sender.Run(error_response.PassAs<dbus::Response>());
|
| + response_sender.Run(error_response.Pass());
|
| return;
|
| }
|
|
|
| @@ -153,7 +153,7 @@ class BluetoothGattDescriptorServiceProviderImpl
|
| dbus::ErrorResponse::FromMethodCall(
|
| method_call, kErrorInvalidArgs,
|
| "No such interface: '" + interface_name + "'.");
|
| - response_sender.Run(error_response.PassAs<dbus::Response>());
|
| + response_sender.Run(error_response.Pass());
|
| return;
|
| }
|
|
|
| @@ -187,9 +187,9 @@ class BluetoothGattDescriptorServiceProviderImpl
|
| writer.CloseContainer(&variant_writer);
|
| } else {
|
| response = dbus::ErrorResponse::FromMethodCall(
|
| - method_call, kErrorInvalidArgs,
|
| - "No such property: '" + property_name + "'.")
|
| - .PassAs<dbus::Response>();
|
| + method_call,
|
| + kErrorInvalidArgs,
|
| + "No such property: '" + property_name + "'.");
|
| }
|
|
|
| response_sender.Run(response.Pass());
|
| @@ -215,7 +215,7 @@ class BluetoothGattDescriptorServiceProviderImpl
|
| scoped_ptr<dbus::ErrorResponse> error_response =
|
| dbus::ErrorResponse::FromMethodCall(
|
| method_call, kErrorInvalidArgs, "Expected 'ssv'.");
|
| - response_sender.Run(error_response.PassAs<dbus::Response>());
|
| + response_sender.Run(error_response.Pass());
|
| return;
|
| }
|
|
|
| @@ -226,7 +226,7 @@ class BluetoothGattDescriptorServiceProviderImpl
|
| dbus::ErrorResponse::FromMethodCall(
|
| method_call, kErrorInvalidArgs,
|
| "No such interface: '" + interface_name + "'.");
|
| - response_sender.Run(error_response.PassAs<dbus::Response>());
|
| + response_sender.Run(error_response.Pass());
|
| return;
|
| }
|
|
|
| @@ -245,7 +245,7 @@ class BluetoothGattDescriptorServiceProviderImpl
|
| scoped_ptr<dbus::ErrorResponse> error_response =
|
| dbus::ErrorResponse::FromMethodCall(
|
| method_call, error_name, error_message);
|
| - response_sender.Run(error_response.PassAs<dbus::Response>());
|
| + response_sender.Run(error_response.Pass());
|
| return;
|
| }
|
|
|
| @@ -257,7 +257,7 @@ class BluetoothGattDescriptorServiceProviderImpl
|
| dbus::ErrorResponse::FromMethodCall(
|
| method_call, kErrorInvalidArgs,
|
| "Property '" + property_name + "' has type 'ay'.");
|
| - response_sender.Run(error_response.PassAs<dbus::Response>());
|
| + response_sender.Run(error_response.Pass());
|
| return;
|
| }
|
|
|
| @@ -289,7 +289,7 @@ class BluetoothGattDescriptorServiceProviderImpl
|
| scoped_ptr<dbus::ErrorResponse> error_response =
|
| dbus::ErrorResponse::FromMethodCall(
|
| method_call, kErrorInvalidArgs, "Expected 's'.");
|
| - response_sender.Run(error_response.PassAs<dbus::Response>());
|
| + response_sender.Run(error_response.Pass());
|
| return;
|
| }
|
|
|
| @@ -300,7 +300,7 @@ class BluetoothGattDescriptorServiceProviderImpl
|
| dbus::ErrorResponse::FromMethodCall(
|
| method_call, kErrorInvalidArgs,
|
| "No such interface: '" + interface_name + "'.");
|
| - response_sender.Run(error_response.PassAs<dbus::Response>());
|
| + response_sender.Run(error_response.Pass());
|
| return;
|
| }
|
|
|
| @@ -404,7 +404,7 @@ class BluetoothGattDescriptorServiceProviderImpl
|
| dbus::ErrorResponse::FromMethodCall(
|
| method_call, kErrorFailed,
|
| "Failed to get/set descriptor value.");
|
| - response_sender.Run(error_response.PassAs<dbus::Response>());
|
| + response_sender.Run(error_response.Pass());
|
| }
|
|
|
| // Origin thread (i.e. the UI thread in production).
|
|
|