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

Unified Diff: extensions/browser/api/networking_private/networking_private_api.cc

Issue 1902873002: Convert //extensions/browser/api from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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: extensions/browser/api/networking_private/networking_private_api.cc
diff --git a/extensions/browser/api/networking_private/networking_private_api.cc b/extensions/browser/api/networking_private/networking_private_api.cc
index 4e6368fc054c3b676b608c02e46af4bed44ab3ec..e9c086d680a68ab8d189465e42466737c1fd8c80 100644
--- a/extensions/browser/api/networking_private/networking_private_api.cc
+++ b/extensions/browser/api/networking_private/networking_private_api.cc
@@ -50,7 +50,7 @@ NetworkingPrivateGetPropertiesFunction::
}
bool NetworkingPrivateGetPropertiesFunction::RunAsync() {
- scoped_ptr<private_api::GetProperties::Params> params =
+ std::unique_ptr<private_api::GetProperties::Params> params =
private_api::GetProperties::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -63,7 +63,7 @@ bool NetworkingPrivateGetPropertiesFunction::RunAsync() {
}
void NetworkingPrivateGetPropertiesFunction::Success(
- scoped_ptr<base::DictionaryValue> result) {
+ std::unique_ptr<base::DictionaryValue> result) {
SetResult(result.release());
SendResponse(true);
}
@@ -81,7 +81,7 @@ NetworkingPrivateGetManagedPropertiesFunction::
}
bool NetworkingPrivateGetManagedPropertiesFunction::RunAsync() {
- scoped_ptr<private_api::GetManagedProperties::Params> params =
+ std::unique_ptr<private_api::GetManagedProperties::Params> params =
private_api::GetManagedProperties::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -96,7 +96,7 @@ bool NetworkingPrivateGetManagedPropertiesFunction::RunAsync() {
}
void NetworkingPrivateGetManagedPropertiesFunction::Success(
- scoped_ptr<base::DictionaryValue> result) {
+ std::unique_ptr<base::DictionaryValue> result) {
SetResult(result.release());
SendResponse(true);
}
@@ -114,7 +114,7 @@ NetworkingPrivateGetStateFunction::~NetworkingPrivateGetStateFunction() {
}
bool NetworkingPrivateGetStateFunction::RunAsync() {
- scoped_ptr<private_api::GetState::Params> params =
+ std::unique_ptr<private_api::GetState::Params> params =
private_api::GetState::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -126,7 +126,7 @@ bool NetworkingPrivateGetStateFunction::RunAsync() {
}
void NetworkingPrivateGetStateFunction::Success(
- scoped_ptr<base::DictionaryValue> result) {
+ std::unique_ptr<base::DictionaryValue> result) {
SetResult(result.release());
SendResponse(true);
}
@@ -144,11 +144,11 @@ NetworkingPrivateSetPropertiesFunction::
}
bool NetworkingPrivateSetPropertiesFunction::RunAsync() {
- scoped_ptr<private_api::SetProperties::Params> params =
+ std::unique_ptr<private_api::SetProperties::Params> params =
private_api::SetProperties::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
- scoped_ptr<base::DictionaryValue> properties_dict(
+ std::unique_ptr<base::DictionaryValue> properties_dict(
params->properties.ToValue());
GetDelegate(browser_context())
@@ -176,11 +176,11 @@ NetworkingPrivateCreateNetworkFunction::
}
bool NetworkingPrivateCreateNetworkFunction::RunAsync() {
- scoped_ptr<private_api::CreateNetwork::Params> params =
+ std::unique_ptr<private_api::CreateNetwork::Params> params =
private_api::CreateNetwork::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
- scoped_ptr<base::DictionaryValue> properties_dict(
+ std::unique_ptr<base::DictionaryValue> properties_dict(
params->properties.ToValue());
GetDelegate(browser_context())
@@ -209,7 +209,7 @@ NetworkingPrivateForgetNetworkFunction::
}
bool NetworkingPrivateForgetNetworkFunction::RunAsync() {
- scoped_ptr<private_api::ForgetNetwork::Params> params =
+ std::unique_ptr<private_api::ForgetNetwork::Params> params =
private_api::ForgetNetwork::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -237,7 +237,7 @@ NetworkingPrivateGetNetworksFunction::~NetworkingPrivateGetNetworksFunction() {
}
bool NetworkingPrivateGetNetworksFunction::RunAsync() {
- scoped_ptr<private_api::GetNetworks::Params> params =
+ std::unique_ptr<private_api::GetNetworks::Params> params =
private_api::GetNetworks::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -258,7 +258,7 @@ bool NetworkingPrivateGetNetworksFunction::RunAsync() {
}
void NetworkingPrivateGetNetworksFunction::Success(
- scoped_ptr<base::ListValue> network_list) {
+ std::unique_ptr<base::ListValue> network_list) {
SetResult(network_list.release());
SendResponse(true);
}
@@ -276,7 +276,7 @@ NetworkingPrivateGetVisibleNetworksFunction::
}
bool NetworkingPrivateGetVisibleNetworksFunction::RunAsync() {
- scoped_ptr<private_api::GetVisibleNetworks::Params> params =
+ std::unique_ptr<private_api::GetVisibleNetworks::Params> params =
private_api::GetVisibleNetworks::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -295,7 +295,7 @@ bool NetworkingPrivateGetVisibleNetworksFunction::RunAsync() {
}
void NetworkingPrivateGetVisibleNetworksFunction::Success(
- scoped_ptr<base::ListValue> network_properties_list) {
+ std::unique_ptr<base::ListValue> network_properties_list) {
SetResult(network_properties_list.release());
SendResponse(true);
}
@@ -314,13 +314,13 @@ NetworkingPrivateGetEnabledNetworkTypesFunction::
}
bool NetworkingPrivateGetEnabledNetworkTypesFunction::RunSync() {
- scoped_ptr<base::ListValue> enabled_networks_onc_types(
+ std::unique_ptr<base::ListValue> enabled_networks_onc_types(
GetDelegate(browser_context())->GetEnabledNetworkTypes());
if (!enabled_networks_onc_types) {
error_ = networking_private::kErrorNotSupported;
return false;
}
- scoped_ptr<base::ListValue> enabled_networks_list(new base::ListValue);
+ std::unique_ptr<base::ListValue> enabled_networks_list(new base::ListValue);
for (base::ListValue::iterator iter = enabled_networks_onc_types->begin();
iter != enabled_networks_onc_types->end(); ++iter) {
std::string type;
@@ -354,14 +354,14 @@ NetworkingPrivateGetDeviceStatesFunction::
}
bool NetworkingPrivateGetDeviceStatesFunction::RunSync() {
- scoped_ptr<NetworkingPrivateDelegate::DeviceStateList> device_states(
+ std::unique_ptr<NetworkingPrivateDelegate::DeviceStateList> device_states(
GetDelegate(browser_context())->GetDeviceStateList());
if (!device_states) {
error_ = networking_private::kErrorNotSupported;
return false;
}
- scoped_ptr<base::ListValue> device_state_list(new base::ListValue);
+ std::unique_ptr<base::ListValue> device_state_list(new base::ListValue);
for (const auto& properties : *device_states)
device_state_list->Append(properties->ToValue().release());
SetResult(device_state_list.release());
@@ -376,7 +376,7 @@ NetworkingPrivateEnableNetworkTypeFunction::
}
bool NetworkingPrivateEnableNetworkTypeFunction::RunSync() {
- scoped_ptr<private_api::EnableNetworkType::Params> params =
+ std::unique_ptr<private_api::EnableNetworkType::Params> params =
private_api::EnableNetworkType::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -392,7 +392,7 @@ NetworkingPrivateDisableNetworkTypeFunction::
}
bool NetworkingPrivateDisableNetworkTypeFunction::RunSync() {
- scoped_ptr<private_api::DisableNetworkType::Params> params =
+ std::unique_ptr<private_api::DisableNetworkType::Params> params =
private_api::DisableNetworkType::Params::Create(*args_);
return GetDelegate(browser_context())
@@ -418,7 +418,7 @@ NetworkingPrivateStartConnectFunction::
}
bool NetworkingPrivateStartConnectFunction::RunAsync() {
- scoped_ptr<private_api::StartConnect::Params> params =
+ std::unique_ptr<private_api::StartConnect::Params> params =
private_api::StartConnect::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -447,7 +447,7 @@ NetworkingPrivateStartDisconnectFunction::
}
bool NetworkingPrivateStartDisconnectFunction::RunAsync() {
- scoped_ptr<private_api::StartDisconnect::Params> params =
+ std::unique_ptr<private_api::StartDisconnect::Params> params =
private_api::StartDisconnect::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -477,7 +477,7 @@ NetworkingPrivateStartActivateFunction::
}
bool NetworkingPrivateStartActivateFunction::RunAsync() {
- scoped_ptr<private_api::StartActivate::Params> params =
+ std::unique_ptr<private_api::StartActivate::Params> params =
private_api::StartActivate::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -506,7 +506,7 @@ NetworkingPrivateVerifyDestinationFunction::
}
bool NetworkingPrivateVerifyDestinationFunction::RunAsync() {
- scoped_ptr<private_api::VerifyDestination::Params> params =
+ std::unique_ptr<private_api::VerifyDestination::Params> params =
private_api::VerifyDestination::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -539,7 +539,7 @@ NetworkingPrivateVerifyAndEncryptCredentialsFunction::
}
bool NetworkingPrivateVerifyAndEncryptCredentialsFunction::RunAsync() {
- scoped_ptr<private_api::VerifyAndEncryptCredentials::Params> params =
+ std::unique_ptr<private_api::VerifyAndEncryptCredentials::Params> params =
private_api::VerifyAndEncryptCredentials::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -575,7 +575,7 @@ NetworkingPrivateVerifyAndEncryptDataFunction::
}
bool NetworkingPrivateVerifyAndEncryptDataFunction::RunAsync() {
- scoped_ptr<private_api::VerifyAndEncryptData::Params> params =
+ std::unique_ptr<private_api::VerifyAndEncryptData::Params> params =
private_api::VerifyAndEncryptData::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -609,7 +609,7 @@ NetworkingPrivateSetWifiTDLSEnabledStateFunction::
}
bool NetworkingPrivateSetWifiTDLSEnabledStateFunction::RunAsync() {
- scoped_ptr<private_api::SetWifiTDLSEnabledState::Params> params =
+ std::unique_ptr<private_api::SetWifiTDLSEnabledState::Params> params =
private_api::SetWifiTDLSEnabledState::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -644,7 +644,7 @@ NetworkingPrivateGetWifiTDLSStatusFunction::
}
bool NetworkingPrivateGetWifiTDLSStatusFunction::RunAsync() {
- scoped_ptr<private_api::GetWifiTDLSStatus::Params> params =
+ std::unique_ptr<private_api::GetWifiTDLSStatus::Params> params =
private_api::GetWifiTDLSStatus::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -679,7 +679,7 @@ NetworkingPrivateGetCaptivePortalStatusFunction::
}
bool NetworkingPrivateGetCaptivePortalStatusFunction::RunAsync() {
- scoped_ptr<private_api::GetCaptivePortalStatus::Params> params =
+ std::unique_ptr<private_api::GetCaptivePortalStatus::Params> params =
private_api::GetCaptivePortalStatus::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -713,7 +713,7 @@ NetworkingPrivateUnlockCellularSimFunction::
~NetworkingPrivateUnlockCellularSimFunction() {}
bool NetworkingPrivateUnlockCellularSimFunction::RunAsync() {
- scoped_ptr<private_api::UnlockCellularSim::Params> params =
+ std::unique_ptr<private_api::UnlockCellularSim::Params> params =
private_api::UnlockCellularSim::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);
@@ -744,7 +744,7 @@ NetworkingPrivateSetCellularSimStateFunction::
~NetworkingPrivateSetCellularSimStateFunction() {}
bool NetworkingPrivateSetCellularSimStateFunction::RunAsync() {
- scoped_ptr<private_api::SetCellularSimState::Params> params =
+ std::unique_ptr<private_api::SetCellularSimState::Params> params =
private_api::SetCellularSimState::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params);

Powered by Google App Engine
This is Rietveld 408576698