Merge 34903, 34928, 35008, 35549, 36054 to the 249s branch....

net/proxy/proxy_info.cc

Index: net/proxy/proxy_info.cc
===================================================================
--- net/proxy/proxy_info.cc	(revision 37149)
+++ 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
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/net/proxy/proxy_info.cc:r34903,34928,35008,35549,36054