Add a new net error code for when the load failure was due to connecting to a bad proxy server.

Prior to this change, users would likely have seen one of these errors on failure to connect through a proxy server:
  ERR_NAME_NOT_RESOLVED
  ERR_ADDRESS_UNREACHABLE
  ERR_CONNECTION_REFUSED
  ERR_CONNECTION_TIMED_OUT
  ERR_CONNECTION_FAILED

Whereas now any host resolve or tcp connect error will map to:
  ERR_PROXY_UNREACHABLE

This error code will allow selecting a more suitable error page.

BUG=53477
Review URL: http://codereview.chromium.org/3360025

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

3 files changed, 5 insertions, 5 deletions

diff --git a/net/socket/socks_client_socket_pool.cc b/net/socket/socks_client_socket_pool.cc
index 20493b3..60f8665 100644
--- a/net/socket/socks_client_socket_pool.cc
+++ b/net/socket/socks_client_socket_pool.cc
@@ -128,7 +128,7 @@ int SOCKSConnectJob::DoTCPConnect() {
 
 int SOCKSConnectJob::DoTCPConnectComplete(int result) {
   if (result != OK)
-    return result;
+    return ERR_PROXY_CONNECTION_FAILED;
 
   // Reset the timer to just the length of time allowed for SOCKS handshake
   // so that a fast TCP connection plus a slow SOCKS failure doesn't take
diff --git a/net/socket/socks_client_socket_pool_unittest.cc b/net/socket/socks_client_socket_pool_unittest.cc
index 14e2bee..c81e8dca 100644
--- a/net/socket/socks_client_socket_pool_unittest.cc
+++ b/net/socket/socks_client_socket_pool_unittest.cc
@@ -119,7 +119,7 @@ TEST_F(SOCKSClientSocketPoolTest, TCPConnectError) {
   ClientSocketHandle handle;
   int rv = handle.Init("a", ignored_socket_params_, LOW, NULL, pool_,
                        BoundNetLog());
-  EXPECT_EQ(ERR_CONNECTION_REFUSED, rv);
+  EXPECT_EQ(ERR_PROXY_CONNECTION_FAILED, rv);
   EXPECT_FALSE(handle.is_initialized());
   EXPECT_FALSE(handle.socket());
 }
@@ -137,7 +137,7 @@ TEST_F(SOCKSClientSocketPoolTest, AsyncTCPConnectError) {
   EXPECT_FALSE(handle.is_initialized());
   EXPECT_FALSE(handle.socket());
 
-  EXPECT_EQ(ERR_CONNECTION_REFUSED, callback.WaitForResult());
+  EXPECT_EQ(ERR_PROXY_CONNECTION_FAILED, callback.WaitForResult());
   EXPECT_FALSE(handle.is_initialized());
   EXPECT_FALSE(handle.socket());
 }
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc
index 378356d..76ed518 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -461,7 +461,7 @@ TEST_F(SSLClientSocketPoolTest, HttpProxyFail) {
   ClientSocketHandle handle;
   TestCompletionCallback callback;
   int rv = handle.Init("a", params, MEDIUM, &callback, pool_, BoundNetLog());
-  EXPECT_EQ(ERR_CONNECTION_FAILED, rv);
+  EXPECT_EQ(ERR_PROXY_CONNECTION_FAILED, rv);
   EXPECT_FALSE(handle.is_initialized());
   EXPECT_FALSE(handle.socket());
   EXPECT_FALSE(handle.is_ssl_error());
@@ -483,7 +483,7 @@ TEST_F(SSLClientSocketPoolTest, HttpProxyFailAsync) {
   EXPECT_FALSE(handle.is_initialized());
   EXPECT_FALSE(handle.socket());
 
-  EXPECT_EQ(ERR_CONNECTION_FAILED, callback.WaitForResult());
+  EXPECT_EQ(ERR_PROXY_CONNECTION_FAILED, callback.WaitForResult());
   EXPECT_FALSE(handle.is_initialized());
   EXPECT_FALSE(handle.socket());
   EXPECT_FALSE(handle.is_ssl_error());