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

Unified Diff: chrome/browser/chromeos/proxy_cros_settings_parser.cc

Issue 11369258: Revert 167808 - Get rid of use of CreateStringValue in chromeos/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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/chromeos/proxy_cros_settings_parser.cc
===================================================================
--- chrome/browser/chromeos/proxy_cros_settings_parser.cc (revision 167824)
+++ chrome/browser/chromeos/proxy_cros_settings_parser.cc (working copy)
@@ -56,7 +56,7 @@
base::Value* CreateServerHostValue(
const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) {
return proxy.server.is_valid() ?
- new base::StringValue(proxy.server.host_port_pair().host()) :
+ base::Value::CreateStringValue(proxy.server.host_port_pair().host()) :
NULL;
}
@@ -298,7 +298,8 @@
if (config.mode ==
chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_PAC_SCRIPT &&
config.automatic_proxy.pac_url.is_valid()) {
- data = new base::StringValue(config.automatic_proxy.pac_url.spec());
+ data =
+ base::Value::CreateStringValue(config.automatic_proxy.pac_url.spec());
}
} else if (path == kProxySingleHttp) {
data = CreateServerHostValue(config.single_proxy);
@@ -356,7 +357,7 @@
ListValue* list = new ListValue();
net::ProxyBypassRules::RuleList bypass_rules = config.bypass_rules.rules();
for (size_t x = 0; x < bypass_rules.size(); x++) {
- list->Append(new base::StringValue(bypass_rules[x]->ToString()));
+ list->Append(base::Value::CreateStringValue(bypass_rules[x]->ToString()));
}
data = list;
} else {
@@ -367,7 +368,7 @@
// Decorate pref value as CoreOptionsHandler::CreateValueForPref() does.
DictionaryValue* dict = new DictionaryValue;
if (!data)
- data = new base::StringValue("");
+ data = base::Value::CreateStringValue("");
dict->Set("value", data);
if (path == kProxyType) {
dict->SetString("controlledBy", controlled_by);

Powered by Google App Engine
This is Rietveld 408576698