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

Unified Diff: chromeos/network/onc/onc_utils.cc

Issue 2843813002: Remove SetWithoutPathExpansion (Closed)
Patch Set: Fix CrOS Error Created 3 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
« no previous file with comments | « chromeos/network/onc/onc_translator_shill_to_onc.cc ('k') | chromeos/network/policy_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/onc/onc_utils.cc
diff --git a/chromeos/network/onc/onc_utils.cc b/chromeos/network/onc/onc_utils.cc
index 2a9a51202b424f7a2086e8111de8e2e25910ee98..b4995078873fc157e31fe41f5908eceb30941fa9 100644
--- a/chromeos/network/onc/onc_utils.cc
+++ b/chromeos/network/onc/onc_utils.cc
@@ -616,7 +616,7 @@ bool ResolveCertRefList(const CertPEMsByGUIDMap& certs_by_guid,
}
onc_object->RemoveWithoutPathExpansion(key_guid_ref_list, nullptr);
- onc_object->SetWithoutPathExpansion(key_pem_list, pem_list.release());
+ onc_object->SetWithoutPathExpansion(key_pem_list, std::move(pem_list));
return true;
}
@@ -635,7 +635,7 @@ bool ResolveSingleCertRefToList(const CertPEMsByGUIDMap& certs_by_guid,
std::unique_ptr<base::ListValue> pem_list(new base::ListValue);
pem_list->AppendString(pem_encoded);
onc_object->RemoveWithoutPathExpansion(key_guid_ref, nullptr);
- onc_object->SetWithoutPathExpansion(key_pem_list, pem_list.release());
+ onc_object->SetWithoutPathExpansion(key_pem_list, std::move(pem_list));
return true;
}
@@ -916,7 +916,7 @@ void SetProxyForScheme(const net::ProxyConfig::ProxyRules& proxy_rules,
url_dict->SetStringWithoutPathExpansion(::onc::proxy::kHost, host);
url_dict->SetIntegerWithoutPathExpansion(::onc::proxy::kPort,
server.host_port_pair().port());
- dict->SetWithoutPathExpansion(onc_scheme, url_dict.release());
+ dict->SetWithoutPathExpansion(onc_scheme, std::move(url_dict));
}
} // namespace
@@ -1014,7 +1014,7 @@ std::unique_ptr<base::DictionaryValue> ConvertProxyConfigToOncProxySettings(
manual.get());
}
proxy_settings->SetWithoutPathExpansion(::onc::proxy::kManual,
- manual.release());
+ std::move(manual));
// Convert the 'bypass_list' string into dictionary entries.
std::string bypass_rules_string;
@@ -1026,7 +1026,7 @@ std::unique_ptr<base::DictionaryValue> ConvertProxyConfigToOncProxySettings(
exclude_domains->AppendString(rule->ToString());
if (!exclude_domains->empty()) {
proxy_settings->SetWithoutPathExpansion(::onc::proxy::kExcludeDomains,
- exclude_domains.release());
+ std::move(exclude_domains));
}
}
break;
« no previous file with comments | « chromeos/network/onc/onc_translator_shill_to_onc.cc ('k') | chromeos/network/policy_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698