Remove the implicit fallback to DIRECT when proxies fail. This better matches other browsers, and simplifies the code.

To better understand what this means, here are some examples how the behaviors will differ for the user:

(1) You start chrome with --proxy-server="foobar:80".
The server "foobar:80" is refusing connections.

  Before: Would fallback to direct after failing to connect through foobar:80.
  Now: Will error-out with connection refused after failing to connect through foobar:80.

(2) You start chrome with --proxy-pac-url="file:///foobar.pac".
The server "foobar:80" is unreachable, and foobar.pac reads:
  function FindProxyForURL(url, host) {
    return "PROXY foobar:80";
  }

  Before: Would fallback to direct after failing to connect through foobar:80.
  Now: Will error-out with connection refused after failing to connect through foobar:80.

(3) You start chrome with --proxy-pac-url="file:///foobar.pac".
The server "foobar:80" is unreachable, and foobar.pac reads:
  function FindProxyForURL(url, host) {
    return "PROXY foobar:80; DIRECT";
  }

  *No change, since the fallback to DIRECT is explicit in the PAC script*

BUG=12303

Review URL: http://codereview.chromium.org/502068

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35549 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 4 deletions

diff --git a/net/proxy/proxy_info.cc b/net/proxy/proxy_info.cc
index 98ca42f..36e9426 100644
--- a/net/proxy/proxy_info.cc
+++ b/net/proxy/proxy_info.cc
@@ -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::Use(const ProxyInfo& other) {
 }
 
 void ProxyInfo::UseDirect() {
-  proxy_list_.Set(std::string());
+  proxy_list_.SetSingleProxyServer(ProxyServer::Direct());
 }
 
 void ProxyInfo::UseNamedProxy(const std::string& proxy_uri_list) {