Index: net/proxy/proxy_config.cc |
=================================================================== |
--- net/proxy/proxy_config.cc (revision 181443) |
+++ net/proxy/proxy_config.cc (working copy) |
@@ -17,7 +17,7 @@ |
// If |proxy| is valid, sets it in |dict| under the key |name|. |
void AddProxyToValue(const char* name, |
const ProxyServer& proxy, |
- DictionaryValue* dict) { |
+ base::DictionaryValue* dict) { |
if (proxy.is_valid()) |
dict->SetString(name, proxy.ToURI()); |
} |
@@ -203,8 +203,8 @@ |
pac_url_ = GURL(); |
} |
-Value* ProxyConfig::ToValue() const { |
- DictionaryValue* dict = new DictionaryValue(); |
+base::Value* ProxyConfig::ToValue() const { |
+ base::DictionaryValue* dict = new base::DictionaryValue(); |
// Output the automatic settings. |
if (auto_detect_) |
@@ -222,7 +222,7 @@ |
AddProxyToValue("single_proxy", proxy_rules_.single_proxy, dict); |
break; |
case ProxyRules::TYPE_PROXY_PER_SCHEME: { |
- DictionaryValue* dict2 = new DictionaryValue(); |
+ base::DictionaryValue* dict2 = new base::DictionaryValue(); |
AddProxyToValue("http", proxy_rules_.proxy_for_http, dict2); |
AddProxyToValue("https", proxy_rules_.proxy_for_https, dict2); |
AddProxyToValue("ftp", proxy_rules_.proxy_for_ftp, dict2); |
@@ -240,12 +240,12 @@ |
if (proxy_rules_.reverse_bypass) |
dict->SetBoolean("reverse_bypass", true); |
- ListValue* list = new ListValue(); |
+ base::ListValue* list = new base::ListValue(); |
for (ProxyBypassRules::RuleList::const_iterator it = |
bypass.rules().begin(); |
it != bypass.rules().end(); ++it) { |
- list->Append(Value::CreateStringValue((*it)->ToString())); |
+ list->Append(new base::StringValue((*it)->ToString())); |
} |
dict->Set("bypass_list", list); |