Index: net/proxy/proxy_info.cc |
=================================================================== |
--- net/proxy/proxy_info.cc (revision 37198) |
+++ net/proxy/proxy_info.cc (working copy) |
@@ -6,9 +6,7 @@ |
namespace net { |
-ProxyInfo::ProxyInfo() |
- : config_id_(ProxyConfig::INVALID_ID), |
- config_was_tried_(false) { |
+ProxyInfo::ProxyInfo() : config_id_(ProxyConfig::INVALID_ID) { |
} |
void ProxyInfo::Use(const ProxyInfo& other) { |
@@ -16,7 +14,7 @@ |
} |
void ProxyInfo::UseDirect() { |
- proxy_list_.Set(std::string()); |
+ proxy_list_.SetSingleProxyServer(ProxyServer::Direct()); |
} |
void ProxyInfo::UseNamedProxy(const std::string& proxy_uri_list) { |
Property changes on: net\proxy\proxy_info.cc |
___________________________________________________________________ |
Deleted: svn:mergeinfo |
Reverse-merged /branches/chrome_webkit_merge_branch/net/proxy/proxy_service.cc:r69-2775 |