commit fd2e53e0043ddab5d0ef4e9ce6dd8c9808e3ea57
author willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jan 14 20:40:52 2011
committer willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jan 14 20:40:52 2011
tree 0498602caa17465f638824149f2a2d702616ba70
parent 61befb486157007dd5472456217fc2dac5fd7f21

Fix preconnect crash on synchronous socket error.

GetAdditionalErrorState() was being called, which stores the error state into the ClientSocketHandle.  When we preconnect, we never have a ClientSocketHandle, so don't bother tryiing to store the error state nor get the error socket.

BUG=69214
TEST=net_unittests

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

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

net/socket/client_socket_pool_base_unittest.cc

diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index c6092d7..803966b 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -2928,6 +2928,13 @@
                         BoundNetLog());
 
   ASSERT_FALSE(pool_->HasGroup("a"));
+
+  connect_job_factory_->set_job_type(
+      TestConnectJob::kMockAdditionalErrorStateJob);
+  pool_->RequestSockets("a", &params_, kDefaultMaxSocketsPerGroup,
+                        BoundNetLog());
+
+  ASSERT_FALSE(pool_->HasGroup("a"));
 }
 
 TEST_F(ClientSocketPoolBaseTest, RequestSocketsMultipleTimesDoesNothing) {