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

Unified Diff: chrome/browser/extensions/api/proxy/proxy_api_helpers.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header 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: chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
index 34c3117de0c76aef256190ef809659b83cf25243..40bf177005bbfdc21096dd0e8f5859ea73beb3f5 100644
--- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
+++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
@@ -364,7 +364,7 @@ base::DictionaryValue* CreateProxyRulesDict(
ProxyPrefs::ProxyMode mode;
CHECK(proxy_config.GetMode(&mode) && mode == ProxyPrefs::MODE_FIXED_SERVERS);
- scoped_ptr<base::DictionaryValue> extension_proxy_rules(
+ std::unique_ptr<base::DictionaryValue> extension_proxy_rules(
new base::DictionaryValue);
std::string proxy_servers;
@@ -430,7 +430,7 @@ base::DictionaryValue* CreateProxyRulesDict(
}
base::DictionaryValue* CreateProxyServerDict(const net::ProxyServer& proxy) {
- scoped_ptr<base::DictionaryValue> out(new base::DictionaryValue);
+ std::unique_ptr<base::DictionaryValue> out(new base::DictionaryValue);
switch (proxy.scheme()) {
case net::ProxyServer::SCHEME_HTTP:
out->SetString(keys::kProxyConfigRuleScheme, "http");
@@ -462,7 +462,8 @@ base::DictionaryValue* CreatePacScriptDict(
ProxyPrefs::ProxyMode mode;
CHECK(proxy_config.GetMode(&mode) && mode == ProxyPrefs::MODE_PAC_SCRIPT);
- scoped_ptr<base::DictionaryValue> pac_script_dict(new base::DictionaryValue);
+ std::unique_ptr<base::DictionaryValue> pac_script_dict(
+ new base::DictionaryValue);
std::string pac_url;
if (!proxy_config.GetPacUrl(&pac_url)) {
LOG(ERROR) << "Invalid proxy configuration. Missing PAC URL.";
« no previous file with comments | « chrome/browser/extensions/api/proxy/proxy_api.cc ('k') | chrome/browser/extensions/api/proxy/proxy_api_helpers_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698