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

Unified Diff: chromeos/dbus/bluetooth_gatt_characteristic_service_provider.cc

Issue 660663003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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: chromeos/dbus/bluetooth_gatt_characteristic_service_provider.cc
diff --git a/chromeos/dbus/bluetooth_gatt_characteristic_service_provider.cc b/chromeos/dbus/bluetooth_gatt_characteristic_service_provider.cc
index edc67b51aa9e27c03362f82595c84dbe6ea73a84..cde005f11eb6aa00b24a43f4ecee0a71ce0abdcf 100644
--- a/chromeos/dbus/bluetooth_gatt_characteristic_service_provider.cc
+++ b/chromeos/dbus/bluetooth_gatt_characteristic_service_provider.cc
@@ -145,7 +145,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
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;
}
@@ -156,7 +156,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
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;
}
@@ -190,9 +190,9 @@ class BluetoothGattCharacteristicServiceProviderImpl
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());
@@ -218,7 +218,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
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;
}
@@ -229,7 +229,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
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;
}
@@ -248,7 +248,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
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;
}
@@ -260,7 +260,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
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;
}
@@ -292,7 +292,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
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;
}
@@ -303,7 +303,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
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;
}
@@ -407,7 +407,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
dbus::ErrorResponse::FromMethodCall(
method_call, kErrorFailed,
"Failed to get/set characteristic value.");
- response_sender.Run(error_response.PassAs<dbus::Response>());
+ response_sender.Run(error_response.Pass());
}
// Origin thread (i.e. the UI thread in production).
« no previous file with comments | « chromeos/dbus/bluetooth_agent_service_provider.cc ('k') | chromeos/dbus/bluetooth_gatt_descriptor_service_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698