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

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

Issue 2806283002: Revert of Stop passing raw pointers to base::Value API in c/b/chromeos and c/b/extensions (Closed)
Patch Set: 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.cc
diff --git a/chrome/browser/extensions/api/proxy/proxy_api.cc b/chrome/browser/extensions/api/proxy/proxy_api.cc
index bb217e854b9d9389dc8f158751d97653cdf14a96..65cffbb33165fff78662edf8b750a8ac3bcf17fe 100644
--- a/chrome/browser/extensions/api/proxy/proxy_api.cc
+++ b/chrome/browser/extensions/api/proxy/proxy_api.cc
@@ -96,7 +96,7 @@
ProxyPrefTransformer::~ProxyPrefTransformer() {
}
-std::unique_ptr<base::Value> ProxyPrefTransformer::ExtensionToBrowserPref(
+base::Value* ProxyPrefTransformer::ExtensionToBrowserPref(
const base::Value* extension_pref,
std::string* error,
bool* bad_message) {
@@ -130,15 +130,16 @@
config, &proxy_rules_string, error, bad_message) ||
!helpers::GetBypassListFromExtensionPref(
config, &bypass_list, error, bad_message)) {
- return nullptr;
+ return NULL;
}
return helpers::CreateProxyConfigDict(mode_enum, pac_mandatory, pac_url,
pac_data, proxy_rules_string,
- bypass_list, error);
+ bypass_list, error)
+ .release();
}
-std::unique_ptr<base::Value> ProxyPrefTransformer::BrowserToExtensionPref(
+base::Value* ProxyPrefTransformer::BrowserToExtensionPref(
const base::Value* browser_pref) {
CHECK(browser_pref->IsType(base::Value::Type::DICTIONARY));
@@ -151,7 +152,7 @@
ProxyPrefs::ProxyMode mode;
if (!config.GetMode(&mode)) {
LOG(ERROR) << "Cannot determine proxy mode.";
- return nullptr;
+ return NULL;
}
// Build a new ProxyConfig instance as defined in the extension API.
@@ -173,7 +174,7 @@
// in the extension API.
base::DictionaryValue* pac_dict = helpers::CreatePacScriptDict(config);
if (!pac_dict)
- return nullptr;
+ return NULL;
extension_pref->Set(keys::kProxyConfigPacScript, pac_dict);
break;
}
@@ -182,14 +183,14 @@
base::DictionaryValue* proxy_rules_dict =
helpers::CreateProxyRulesDict(config);
if (!proxy_rules_dict)
- return nullptr;
+ return NULL;
extension_pref->Set(keys::kProxyConfigRules, proxy_rules_dict);
break;
}
case ProxyPrefs::kModeCount:
NOTREACHED();
}
- return extension_pref;
+ return extension_pref.release();
}
} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/api/proxy/proxy_api.h ('k') | chrome/browser/extensions/api/proxy/proxy_api_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698