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

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

Issue 2777063003: Stop passing raw pointers to base::Value API in c/b/chromeos and c/b/extensions (Closed)
Patch Set: Just rebased 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
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 f14448593a28c467368309ab82250feb66a477b0..48b590a2516875df99c0b7f9bdfd4a487fac1716 100644
--- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
+++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
@@ -330,12 +330,12 @@ std::unique_ptr<base::DictionaryValue> CreateProxyConfigDict(
} else if (!pac_data.empty()) {
if (!CreateDataURLFromPACScript(pac_data, &url)) {
*error = "Internal error, at base64 encoding of 'pacScript.data'.";
- return NULL;
+ return nullptr;
}
} else {
*error = "Proxy mode 'pac_script' requires a 'pacScript' field with "
"either a 'url' field or a 'data' field.";
- return NULL;
+ return nullptr;
}
result_proxy_config =
ProxyConfigDictionary::CreatePacScript(url, pac_mandatory);
@@ -344,7 +344,7 @@ std::unique_ptr<base::DictionaryValue> CreateProxyConfigDict(
case ProxyPrefs::MODE_FIXED_SERVERS: {
if (proxy_rules_string.empty()) {
*error = "Proxy mode 'fixed_servers' requires a 'rules' field.";
- return NULL;
+ return nullptr;
}
result_proxy_config = ProxyConfigDictionary::CreateFixedServers(
proxy_rules_string, bypass_list);

Powered by Google App Engine
This is Rietveld 408576698