Skip to content

GitLab

T
tangled
Commit b92d87be authored by dcheng's avatar dcheng Committed by Commit bot
Browse files
Options

Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. 

BUG=423621

Review URL: https://codereview.chromium.org/660663003

Cr-Commit-Position: refs/heads/master@{#299949}
parent 327e5f5f
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 65 deletions
chromeos/cryptohome/homedir_methods_unittest.cc
View file @ b92d87be
...@@ -88,7 +88,7 @@ void HomedirMethodsTest::SetUp() { ...@@ -88,7 +88,7 @@ void HomedirMethodsTest::SetUp() {
new chromeos::MockCryptohomeClient); new chromeos::MockCryptohomeClient);
cryptohome_client_ = cryptohome_client.get(); cryptohome_client_ = cryptohome_client.get();
chromeos::DBusThreadManager::GetSetterForTesting()->SetCryptohomeClient( chromeos::DBusThreadManager::GetSetterForTesting()->SetCryptohomeClient(
cryptohome_client.PassAs<chromeos::CryptohomeClient>()); cryptohome_client.Pass());
HomedirMethods::Initialize(); HomedirMethods::Initialize();
} }
......
chromeos/dbus/bluetooth_agent_service_provider.cc
View file @ b92d87be
...@@ -347,17 +347,13 @@ class BluetoothAgentServiceProviderImpl ...@@ -347,17 +347,13 @@ class BluetoothAgentServiceProviderImpl
break; break;
} }
case Delegate::REJECTED: { case Delegate::REJECTED: {
response_sender.Run( response_sender.Run(dbus::ErrorResponse::FromMethodCall(
dbus::ErrorResponse::FromMethodCall( method_call, bluetooth_agent::kErrorRejected, "rejected"));
method_call, bluetooth_agent::kErrorRejected, "rejected")
.PassAs<dbus::Response>());
break; break;
} }
case Delegate::CANCELLED: { case Delegate::CANCELLED: {
response_sender.Run( response_sender.Run(dbus::ErrorResponse::FromMethodCall(
dbus::ErrorResponse::FromMethodCall( method_call, bluetooth_agent::kErrorCanceled, "canceled"));
method_call, bluetooth_agent::kErrorCanceled, "canceled")
.PassAs<dbus::Response>());
break; break;
} }
default: default:
...@@ -382,17 +378,13 @@ class BluetoothAgentServiceProviderImpl ...@@ -382,17 +378,13 @@ class BluetoothAgentServiceProviderImpl
break; break;
} }
case Delegate::REJECTED: { case Delegate::REJECTED: {
response_sender.Run( response_sender.Run(dbus::ErrorResponse::FromMethodCall(
dbus::ErrorResponse::FromMethodCall( method_call, bluetooth_agent::kErrorRejected, "rejected"));
method_call, bluetooth_agent::kErrorRejected, "rejected")
.PassAs<dbus::Response>());
break; break;
} }
case Delegate::CANCELLED: { case Delegate::CANCELLED: {
response_sender.Run( response_sender.Run(dbus::ErrorResponse::FromMethodCall(
dbus::ErrorResponse::FromMethodCall( method_call, bluetooth_agent::kErrorCanceled, "canceled"));
method_call, bluetooth_agent::kErrorCanceled, "canceled")
.PassAs<dbus::Response>());
break; break;
} }
default: default:
...@@ -412,17 +404,13 @@ class BluetoothAgentServiceProviderImpl ...@@ -412,17 +404,13 @@ class BluetoothAgentServiceProviderImpl
break; break;
} }
case Delegate::REJECTED: { case Delegate::REJECTED: {
response_sender.Run( response_sender.Run(dbus::ErrorResponse::FromMethodCall(
dbus::ErrorResponse::FromMethodCall( method_call, bluetooth_agent::kErrorRejected, "rejected"));
method_call, bluetooth_agent::kErrorRejected, "rejected")
.PassAs<dbus::Response>());
break; break;
} }
case Delegate::CANCELLED: { case Delegate::CANCELLED: {
response_sender.Run( response_sender.Run(dbus::ErrorResponse::FromMethodCall(
dbus::ErrorResponse::FromMethodCall( method_call, bluetooth_agent::kErrorCanceled, "canceled"));
method_call, bluetooth_agent::kErrorCanceled, "canceled")
.PassAs<dbus::Response>());
break; break;
} }
default: default:
......
chromeos/dbus/bluetooth_gatt_characteristic_service_provider.cc
View file @ b92d87be
...@@ -145,7 +145,7 @@ class BluetoothGattCharacteristicServiceProviderImpl ...@@ -145,7 +145,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
scoped_ptr<dbus::ErrorResponse> error_response = scoped_ptr<dbus::ErrorResponse> error_response =
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, "Expected 'ss'."); method_call, kErrorInvalidArgs, "Expected 'ss'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -156,7 +156,7 @@ class BluetoothGattCharacteristicServiceProviderImpl ...@@ -156,7 +156,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, method_call, kErrorInvalidArgs,
"No such interface: '" + interface_name + "'."); "No such interface: '" + interface_name + "'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -190,9 +190,9 @@ class BluetoothGattCharacteristicServiceProviderImpl ...@@ -190,9 +190,9 @@ class BluetoothGattCharacteristicServiceProviderImpl
writer.CloseContainer(&variant_writer); writer.CloseContainer(&variant_writer);
} else { } else {
response = dbus::ErrorResponse::FromMethodCall( response = dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, method_call,
"No such property: '" + property_name + "'.") kErrorInvalidArgs,
.PassAs<dbus::Response>(); "No such property: '" + property_name + "'.");
} }
response_sender.Run(response.Pass()); response_sender.Run(response.Pass());
...@@ -218,7 +218,7 @@ class BluetoothGattCharacteristicServiceProviderImpl ...@@ -218,7 +218,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
scoped_ptr<dbus::ErrorResponse> error_response = scoped_ptr<dbus::ErrorResponse> error_response =
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, "Expected 'ssv'."); method_call, kErrorInvalidArgs, "Expected 'ssv'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -229,7 +229,7 @@ class BluetoothGattCharacteristicServiceProviderImpl ...@@ -229,7 +229,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, method_call, kErrorInvalidArgs,
"No such interface: '" + interface_name + "'."); "No such interface: '" + interface_name + "'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -248,7 +248,7 @@ class BluetoothGattCharacteristicServiceProviderImpl ...@@ -248,7 +248,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
scoped_ptr<dbus::ErrorResponse> error_response = scoped_ptr<dbus::ErrorResponse> error_response =
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, error_name, error_message); method_call, error_name, error_message);
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -260,7 +260,7 @@ class BluetoothGattCharacteristicServiceProviderImpl ...@@ -260,7 +260,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, method_call, kErrorInvalidArgs,
"Property '" + property_name + "' has type 'ay'."); "Property '" + property_name + "' has type 'ay'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -292,7 +292,7 @@ class BluetoothGattCharacteristicServiceProviderImpl ...@@ -292,7 +292,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
scoped_ptr<dbus::ErrorResponse> error_response = scoped_ptr<dbus::ErrorResponse> error_response =
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, "Expected 's'."); method_call, kErrorInvalidArgs, "Expected 's'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -303,7 +303,7 @@ class BluetoothGattCharacteristicServiceProviderImpl ...@@ -303,7 +303,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, method_call, kErrorInvalidArgs,
"No such interface: '" + interface_name + "'."); "No such interface: '" + interface_name + "'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -407,7 +407,7 @@ class BluetoothGattCharacteristicServiceProviderImpl ...@@ -407,7 +407,7 @@ class BluetoothGattCharacteristicServiceProviderImpl
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorFailed, method_call, kErrorFailed,
"Failed to get/set characteristic value."); "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). // Origin thread (i.e. the UI thread in production).
......
chromeos/dbus/bluetooth_gatt_descriptor_service_provider.cc
View file @ b92d87be
...@@ -142,7 +142,7 @@ class BluetoothGattDescriptorServiceProviderImpl ...@@ -142,7 +142,7 @@ class BluetoothGattDescriptorServiceProviderImpl
scoped_ptr<dbus::ErrorResponse> error_response = scoped_ptr<dbus::ErrorResponse> error_response =
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, "Expected 'ss'."); method_call, kErrorInvalidArgs, "Expected 'ss'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -153,7 +153,7 @@ class BluetoothGattDescriptorServiceProviderImpl ...@@ -153,7 +153,7 @@ class BluetoothGattDescriptorServiceProviderImpl
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, method_call, kErrorInvalidArgs,
"No such interface: '" + interface_name + "'."); "No such interface: '" + interface_name + "'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -187,9 +187,9 @@ class BluetoothGattDescriptorServiceProviderImpl ...@@ -187,9 +187,9 @@ class BluetoothGattDescriptorServiceProviderImpl
writer.CloseContainer(&variant_writer); writer.CloseContainer(&variant_writer);
} else { } else {
response = dbus::ErrorResponse::FromMethodCall( response = dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, method_call,
"No such property: '" + property_name + "'.") kErrorInvalidArgs,
.PassAs<dbus::Response>(); "No such property: '" + property_name + "'.");
} }
response_sender.Run(response.Pass()); response_sender.Run(response.Pass());
...@@ -215,7 +215,7 @@ class BluetoothGattDescriptorServiceProviderImpl ...@@ -215,7 +215,7 @@ class BluetoothGattDescriptorServiceProviderImpl
scoped_ptr<dbus::ErrorResponse> error_response = scoped_ptr<dbus::ErrorResponse> error_response =
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, "Expected 'ssv'."); method_call, kErrorInvalidArgs, "Expected 'ssv'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -226,7 +226,7 @@ class BluetoothGattDescriptorServiceProviderImpl ...@@ -226,7 +226,7 @@ class BluetoothGattDescriptorServiceProviderImpl
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, method_call, kErrorInvalidArgs,
"No such interface: '" + interface_name + "'."); "No such interface: '" + interface_name + "'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -245,7 +245,7 @@ class BluetoothGattDescriptorServiceProviderImpl ...@@ -245,7 +245,7 @@ class BluetoothGattDescriptorServiceProviderImpl
scoped_ptr<dbus::ErrorResponse> error_response = scoped_ptr<dbus::ErrorResponse> error_response =
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, error_name, error_message); method_call, error_name, error_message);
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -257,7 +257,7 @@ class BluetoothGattDescriptorServiceProviderImpl ...@@ -257,7 +257,7 @@ class BluetoothGattDescriptorServiceProviderImpl
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, method_call, kErrorInvalidArgs,
"Property '" + property_name + "' has type 'ay'."); "Property '" + property_name + "' has type 'ay'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -289,7 +289,7 @@ class BluetoothGattDescriptorServiceProviderImpl ...@@ -289,7 +289,7 @@ class BluetoothGattDescriptorServiceProviderImpl
scoped_ptr<dbus::ErrorResponse> error_response = scoped_ptr<dbus::ErrorResponse> error_response =
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, "Expected 's'."); method_call, kErrorInvalidArgs, "Expected 's'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -300,7 +300,7 @@ class BluetoothGattDescriptorServiceProviderImpl ...@@ -300,7 +300,7 @@ class BluetoothGattDescriptorServiceProviderImpl
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, method_call, kErrorInvalidArgs,
"No such interface: '" + interface_name + "'."); "No such interface: '" + interface_name + "'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -404,7 +404,7 @@ class BluetoothGattDescriptorServiceProviderImpl ...@@ -404,7 +404,7 @@ class BluetoothGattDescriptorServiceProviderImpl
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorFailed, method_call, kErrorFailed,
"Failed to get/set descriptor value."); "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). // Origin thread (i.e. the UI thread in production).
......
chromeos/dbus/bluetooth_gatt_service_service_provider.cc
View file @ b92d87be
...@@ -100,7 +100,7 @@ class BluetoothGattServiceServiceProviderImpl ...@@ -100,7 +100,7 @@ class BluetoothGattServiceServiceProviderImpl
scoped_ptr<dbus::ErrorResponse> error_response = scoped_ptr<dbus::ErrorResponse> error_response =
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, "Expected 'ss'."); method_call, kErrorInvalidArgs, "Expected 'ss'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -111,7 +111,7 @@ class BluetoothGattServiceServiceProviderImpl ...@@ -111,7 +111,7 @@ class BluetoothGattServiceServiceProviderImpl
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, method_call, kErrorInvalidArgs,
"No such interface: '" + interface_name + "'."); "No such interface: '" + interface_name + "'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -122,7 +122,7 @@ class BluetoothGattServiceServiceProviderImpl ...@@ -122,7 +122,7 @@ class BluetoothGattServiceServiceProviderImpl
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, method_call, kErrorInvalidArgs,
"No such property: '" + property_name + "'."); "No such property: '" + property_name + "'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -158,7 +158,7 @@ class BluetoothGattServiceServiceProviderImpl ...@@ -158,7 +158,7 @@ class BluetoothGattServiceServiceProviderImpl
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorPropertyReadOnly, method_call, kErrorPropertyReadOnly,
"All properties are read-only."); "All properties are read-only.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
} }
// Called by dbus:: when the Bluetooth daemon fetches all properties of the // Called by dbus:: when the Bluetooth daemon fetches all properties of the
...@@ -176,7 +176,7 @@ class BluetoothGattServiceServiceProviderImpl ...@@ -176,7 +176,7 @@ class BluetoothGattServiceServiceProviderImpl
scoped_ptr<dbus::ErrorResponse> error_response = scoped_ptr<dbus::ErrorResponse> error_response =
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, "Expected 's'."); method_call, kErrorInvalidArgs, "Expected 's'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
...@@ -187,7 +187,7 @@ class BluetoothGattServiceServiceProviderImpl ...@@ -187,7 +187,7 @@ class BluetoothGattServiceServiceProviderImpl
dbus::ErrorResponse::FromMethodCall( dbus::ErrorResponse::FromMethodCall(
method_call, kErrorInvalidArgs, method_call, kErrorInvalidArgs,
"No such interface: '" + interface_name + "'."); "No such interface: '" + interface_name + "'.");
response_sender.Run(error_response.PassAs<dbus::Response>()); response_sender.Run(error_response.Pass());
return; return;
} }
......
chromeos/dbus/bluetooth_profile_service_provider.cc
View file @ b92d87be
...@@ -195,17 +195,13 @@ class BluetoothProfileServiceProviderImpl ...@@ -195,17 +195,13 @@ class BluetoothProfileServiceProviderImpl
break; break;
} }
case Delegate::REJECTED: { case Delegate::REJECTED: {
response_sender.Run( response_sender.Run(dbus::ErrorResponse::FromMethodCall(
dbus::ErrorResponse::FromMethodCall( method_call, bluetooth_profile::kErrorRejected, "rejected"));
method_call, bluetooth_profile::kErrorRejected, "rejected")
.PassAs<dbus::Response>());
break; break;
} }
case Delegate::CANCELLED: { case Delegate::CANCELLED: {
response_sender.Run( response_sender.Run(dbus::ErrorResponse::FromMethodCall(
dbus::ErrorResponse::FromMethodCall( method_call, bluetooth_profile::kErrorCanceled, "canceled"));
method_call, bluetooth_profile::kErrorCanceled, "canceled")
.PassAs<dbus::Response>());
break; break;
} }
default: default:
......
chromeos/network/onc/onc_merger.cc
View file @ b92d87be
...@@ -382,7 +382,7 @@ class MergeToAugmented : public MergeToEffective { ...@@ -382,7 +382,7 @@ class MergeToAugmented : public MergeToEffective {
// Don't augment the GUID but write the plain value. // Don't augment the GUID but write the plain value.
if (!effective_value) { if (!effective_value) {
LOG(ERROR) << "GUID field has no effective value"; LOG(ERROR) << "GUID field has no effective value";
return make_scoped_ptr<base::Value>(NULL); return nullptr;
} }
// DCHECK that all provided GUIDs are identical. // DCHECK that all provided GUIDs are identical.
...@@ -439,7 +439,7 @@ class MergeToAugmented : public MergeToEffective { ...@@ -439,7 +439,7 @@ class MergeToAugmented : public MergeToEffective {
} }
if (augmented_value->empty()) if (augmented_value->empty())
augmented_value.reset(); augmented_value.reset();
return augmented_value.PassAs<base::Value>(); return augmented_value.Pass();
} }
// MergeListOfDictionaries override. // MergeListOfDictionaries override.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment