Modify the MockConnect constructor to take an enum of ASYNC or SYNCHRONOUS,

instead of a boolean async.

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

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

15 files changed, 75 insertions, 69 deletions

diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index fef1512..c69e319 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -6448,7 +6448,7 @@ TEST_F(HttpNetworkTransactionTest, MarkBrokenAlternateProtocolAndFallback) {
   request.url = GURL("http://www.google.com/");
   request.load_flags = 0;
 
-  MockConnect mock_connect(true, ERR_CONNECTION_REFUSED);
+  MockConnect mock_connect(ASYNC, ERR_CONNECTION_REFUSED);
   StaticSocketDataProvider first_data;
   first_data.set_connect_data(mock_connect);
   session_deps.socket_factory.AddSocketDataProvider(&first_data);
@@ -6511,7 +6511,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortRestrictedBlocked) {
   restricted_port_request.url = GURL("http://www.google.com:1023/");
   restricted_port_request.load_flags = 0;
 
-  MockConnect mock_connect(true, ERR_CONNECTION_REFUSED);
+  MockConnect mock_connect(ASYNC, ERR_CONNECTION_REFUSED);
   StaticSocketDataProvider first_data;
   first_data.set_connect_data(mock_connect);
   session_deps.socket_factory.AddSocketDataProvider(&first_data);
@@ -6560,7 +6560,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortRestrictedAllowed) {
   restricted_port_request.url = GURL("http://www.google.com:1023/");
   restricted_port_request.load_flags = 0;
 
-  MockConnect mock_connect(true, ERR_CONNECTION_REFUSED);
+  MockConnect mock_connect(ASYNC, ERR_CONNECTION_REFUSED);
   StaticSocketDataProvider first_data;
   first_data.set_connect_data(mock_connect);
   session_deps.socket_factory.AddSocketDataProvider(&first_data);
@@ -6609,7 +6609,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortUnrestrictedAllowed1) {
   unrestricted_port_request.url = GURL("http://www.google.com:1024/");
   unrestricted_port_request.load_flags = 0;
 
-  MockConnect mock_connect(true, ERR_CONNECTION_REFUSED);
+  MockConnect mock_connect(ASYNC, ERR_CONNECTION_REFUSED);
   StaticSocketDataProvider first_data;
   first_data.set_connect_data(mock_connect);
   session_deps.socket_factory.AddSocketDataProvider(&first_data);
@@ -6658,7 +6658,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortUnrestrictedAllowed2) {
   unrestricted_port_request.url = GURL("http://www.google.com:1024/");
   unrestricted_port_request.load_flags = 0;
 
-  MockConnect mock_connect(true, ERR_CONNECTION_REFUSED);
+  MockConnect mock_connect(ASYNC, ERR_CONNECTION_REFUSED);
   StaticSocketDataProvider first_data;
   first_data.set_connect_data(mock_connect);
   session_deps.socket_factory.AddSocketDataProvider(&first_data);
@@ -6794,7 +6794,7 @@ TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForNpnSpdy) {
           spdy_writes, arraysize(spdy_writes)));
   session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
 
-  MockConnect never_finishing_connect(false, ERR_IO_PENDING);
+  MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
   StaticSocketDataProvider hanging_non_alternate_protocol_socket(
       NULL, 0, NULL, 0);
   hanging_non_alternate_protocol_socket.set_connect_data(
@@ -6862,7 +6862,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolWithSpdyLateBinding) {
   // Socket 1 is the HTTP transaction with the Alternate-Protocol header.
   session_deps.socket_factory.AddSocketDataProvider(&first_transaction);
 
-  MockConnect never_finishing_connect(false, ERR_IO_PENDING);
+  MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
   StaticSocketDataProvider hanging_socket(
       NULL, 0, NULL, 0);
   hanging_socket.set_connect_data(never_finishing_connect);
@@ -6987,7 +6987,7 @@ TEST_F(HttpNetworkTransactionTest, StallAlternateProtocolForNpnSpdy) {
   ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
   session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
 
-  MockConnect never_finishing_connect(false, ERR_IO_PENDING);
+  MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
   StaticSocketDataProvider hanging_alternate_protocol_socket(
       NULL, 0, NULL, 0);
   hanging_alternate_protocol_socket.set_connect_data(
@@ -7147,7 +7147,7 @@ TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForTunneledNpnSpdy) {
           spdy_writes, arraysize(spdy_writes)));
   session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
 
-  MockConnect never_finishing_connect(false, ERR_IO_PENDING);
+  MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
   StaticSocketDataProvider hanging_non_alternate_protocol_socket(
       NULL, 0, NULL, 0);
   hanging_non_alternate_protocol_socket.set_connect_data(
@@ -7971,7 +7971,7 @@ TEST_F(HttpNetworkTransactionTest, RestartAfterTLSDecompressionFailure) {
 
   // Work around http://crbug.com/37454
   StaticSocketDataProvider bug37454_connection;
-  bug37454_connection.set_connect_data(MockConnect(true, ERR_UNEXPECTED));
+  bug37454_connection.set_connect_data(MockConnect(ASYNC, ERR_UNEXPECTED));
   session_deps.socket_factory.AddSocketDataProvider(&bug37454_connection);
 
   scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -8249,7 +8249,7 @@ TEST_F(HttpNetworkTransactionTest, SpdyAlternateProtocolThroughProxy) {
   ssl.was_npn_negotiated = true;
   ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
 
-  MockConnect never_finishing_connect(false, ERR_IO_PENDING);
+  MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
   StaticSocketDataProvider hanging_non_alternate_protocol_socket(
       NULL, 0, NULL, 0);
   hanging_non_alternate_protocol_socket.set_connect_data(
@@ -8304,7 +8304,7 @@ TEST_F(HttpNetworkTransactionTest, SimpleCancel) {
   // for is the callback from the HttpStreamRequest.
   // Then cancel the transaction.
   // Verify that we don't crash.
-  MockConnect mock_connect(false, OK);
+  MockConnect mock_connect(SYNCHRONOUS, OK);
   MockRead data_reads[] = {
     MockRead(false, "HTTP/1.0 200 OK\r\n\r\n"),
     MockRead(false, "hello world"),
diff --git a/net/http/http_pipelined_connection_impl_unittest.cc b/net/http/http_pipelined_connection_impl_unittest.cc
index fbba3bc..1ed08cb 100644
--- a/net/http/http_pipelined_connection_impl_unittest.cc
+++ b/net/http/http_pipelined_connection_impl_unittest.cc
@@ -81,7 +81,7 @@ class HttpPipelinedConnectionImplTest : public testing::Test {
                   MockWrite* writes, size_t writes_count) {
     data_ = new DeterministicSocketData(reads, reads_count,
                                         writes, writes_count);
-    data_->set_connect_data(MockConnect(false, 0));
+    data_->set_connect_data(MockConnect(SYNCHRONOUS, OK));
     if (reads_count || writes_count) {
       data_->StopAfter(reads_count + writes_count);
     }
diff --git a/net/http/http_pipelined_network_transaction_unittest.cc b/net/http/http_pipelined_network_transaction_unittest.cc
index 714aa3b..c4e42a0 100644
--- a/net/http/http_pipelined_network_transaction_unittest.cc
+++ b/net/http/http_pipelined_network_transaction_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -70,7 +70,7 @@ class HttpPipelinedNetworkTransactionTest : public testing::Test {
                              MockWrite* writes, size_t writes_count) {
     DeterministicSocketData* data = new DeterministicSocketData(
         reads, reads_count, writes, writes_count);
-    data->set_connect_data(MockConnect(false, 0));
+    data->set_connect_data(MockConnect(SYNCHRONOUS, OK));
     if (reads_count || writes_count) {
       data->StopAfter(reads_count + writes_count);
     }
diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc
index 433612f..b856eb9 100644
--- a/net/http/http_proxy_client_socket_pool_unittest.cc
+++ b/net/http/http_proxy_client_socket_pool_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -146,7 +146,7 @@ class HttpProxyClientSocketPoolTest : public TestWithHttpParam {
     return socket_factory_;
   }
 
-  void Initialize(bool async, MockRead* reads, size_t reads_count,
+  void Initialize(MockRead* reads, size_t reads_count,
                   MockWrite* writes, size_t writes_count,
                   MockRead* spdy_reads, size_t spdy_reads_count,
                   MockWrite* spdy_writes, size_t spdy_writes_count) {
@@ -157,13 +157,13 @@ class HttpProxyClientSocketPoolTest : public TestWithHttpParam {
       data_ = new DeterministicSocketData(reads, reads_count, writes,
                                           writes_count);
 
-    data_->set_connect_data(MockConnect(async, 0));
+    data_->set_connect_data(MockConnect(SYNCHRONOUS, OK));
     data_->StopAfter(2);  // Request / Response
 
     socket_factory_.AddSocketDataProvider(data_.get());
 
     if (GetParam() != HTTP) {
-      ssl_data_.reset(new SSLSocketDataProvider(async, OK));
+      ssl_data_.reset(new SSLSocketDataProvider(false, OK));
       if (GetParam() == SPDY) {
         InitializeSpdySsl();
       }
@@ -227,7 +227,7 @@ INSTANTIATE_TEST_CASE_P(HttpProxyClientSocketPoolTests,
                         ::testing::Values(HTTP, HTTPS, SPDY));
 
 TEST_P(HttpProxyClientSocketPoolTest, NoTunnel) {
-  Initialize(false, NULL, 0, NULL, 0, NULL, 0, NULL, 0);
+  Initialize(NULL, 0, NULL, 0, NULL, 0, NULL, 0);
 
   int rv = handle_.Init("a", GetNoTunnelParams(), LOW, CompletionCallback(),
                         &pool_, BoundNetLog());
@@ -266,7 +266,7 @@ TEST_P(HttpProxyClientSocketPoolTest, NeedAuth) {
     MockRead(true, 0, 3)
   };
 
-  Initialize(false, reads, arraysize(reads), writes, arraysize(writes),
+  Initialize(reads, arraysize(reads), writes, arraysize(writes),
              spdy_reads, arraysize(spdy_reads), spdy_writes,
              arraysize(spdy_writes));
 
@@ -311,7 +311,7 @@ TEST_P(HttpProxyClientSocketPoolTest, HaveAuth) {
     MockRead(false, 1, "HTTP/1.1 200 Connection Established\r\n\r\n"),
   };
 
-  Initialize(false, reads, arraysize(reads), writes, arraysize(writes), NULL, 0,
+  Initialize(reads, arraysize(reads), writes, arraysize(writes), NULL, 0,
              NULL, 0);
   AddAuthToCache();
 
@@ -347,7 +347,7 @@ TEST_P(HttpProxyClientSocketPoolTest, AsyncHaveAuth) {
     MockRead(true, 0, 2)
   };
 
-  Initialize(false, reads, arraysize(reads), writes, arraysize(writes),
+  Initialize(reads, arraysize(reads), writes, arraysize(writes),
              spdy_reads, arraysize(spdy_reads), spdy_writes,
              arraysize(spdy_writes));
   AddAuthToCache();
@@ -370,7 +370,7 @@ TEST_P(HttpProxyClientSocketPoolTest, AsyncHaveAuth) {
 TEST_P(HttpProxyClientSocketPoolTest, TCPError) {
   if (GetParam() == SPDY) return;
   data_ = new DeterministicSocketData(NULL, 0, NULL, 0);
-  data_->set_connect_data(MockConnect(true, ERR_CONNECTION_CLOSED));
+  data_->set_connect_data(MockConnect(ASYNC, ERR_CONNECTION_CLOSED));
 
   socket_factory().AddSocketDataProvider(data_.get());
 
@@ -389,7 +389,7 @@ TEST_P(HttpProxyClientSocketPoolTest, TCPError) {
 TEST_P(HttpProxyClientSocketPoolTest, SSLError) {
   if (GetParam() == HTTP) return;
   data_ = new DeterministicSocketData(NULL, 0, NULL, 0);
-  data_->set_connect_data(MockConnect(true, OK));
+  data_->set_connect_data(MockConnect(ASYNC, OK));
   socket_factory().AddSocketDataProvider(data_.get());
 
   ssl_data_.reset(new SSLSocketDataProvider(true,
@@ -414,7 +414,7 @@ TEST_P(HttpProxyClientSocketPoolTest, SSLError) {
 TEST_P(HttpProxyClientSocketPoolTest, SslClientAuth) {
   if (GetParam() == HTTP) return;
   data_ = new DeterministicSocketData(NULL, 0, NULL, 0);
-  data_->set_connect_data(MockConnect(true, OK));
+  data_->set_connect_data(MockConnect(ASYNC, OK));
   socket_factory().AddSocketDataProvider(data_.get());
 
   ssl_data_.reset(new SSLSocketDataProvider(true,
@@ -457,7 +457,7 @@ TEST_P(HttpProxyClientSocketPoolTest, TunnelUnexpectedClose) {
     MockRead(true, ERR_CONNECTION_CLOSED, 1),
   };
 
-  Initialize(false, reads, arraysize(reads), writes, arraysize(writes),
+  Initialize(reads, arraysize(reads), writes, arraysize(writes),
              spdy_reads, arraysize(spdy_reads), spdy_writes,
              arraysize(spdy_writes));
   AddAuthToCache();
@@ -498,7 +498,7 @@ TEST_P(HttpProxyClientSocketPoolTest, TunnelSetupError) {
     MockRead(true, 0, 3),
   };
 
-  Initialize(false, reads, arraysize(reads), writes, arraysize(writes),
+  Initialize(reads, arraysize(reads), writes, arraysize(writes),
              spdy_reads, arraysize(spdy_reads), spdy_writes,
              arraysize(spdy_writes));
   AddAuthToCache();
diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc
index f73b73a..d554256 100644
--- a/net/http/http_stream_factory_impl_unittest.cc
+++ b/net/http/http_stream_factory_impl_unittest.cc
@@ -424,12 +424,12 @@ TEST(HttpStreamFactoryTest, JobNotifiesProxy) {
 
   // First connection attempt fails
   StaticSocketDataProvider socket_data1;
-  socket_data1.set_connect_data(MockConnect(true, ERR_ADDRESS_UNREACHABLE));
+  socket_data1.set_connect_data(MockConnect(ASYNC, ERR_ADDRESS_UNREACHABLE));
   session_deps.socket_factory.AddSocketDataProvider(&socket_data1);
 
   // Second connection attempt succeeds
   StaticSocketDataProvider socket_data2;
-  socket_data2.set_connect_data(MockConnect(true, OK));
+  socket_data2.set_connect_data(MockConnect(ASYNC, OK));
   session_deps.socket_factory.AddSocketDataProvider(&socket_data2);
 
   scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
diff --git a/net/socket/deterministic_socket_data_unittest.cc b/net/socket/deterministic_socket_data_unittest.cc
index ee0539e..5989f91 100644
--- a/net/socket/deterministic_socket_data_unittest.cc
+++ b/net/socket/deterministic_socket_data_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -64,7 +64,7 @@ DeterministicSocketDataTest::DeterministicSocketDataTest()
     : sock_(NULL),
       data_(NULL),
       read_buf_(NULL),
-      connect_data_(false, OK),
+      connect_data_(SYNCHRONOUS, OK),
       endpoint_("www.google.com", 443),
       tcp_params_(new TransportSocketParams(endpoint_,
                                             LOWEST,
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index f52e15b..1a12e08 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -237,7 +237,7 @@ void DynamicSocketDataProvider::SimulateRead(const char* data,
 }
 
 SSLSocketDataProvider::SSLSocketDataProvider(bool async, int result)
-    : connect(async, result),
+    : connect(async ? ASYNC : SYNCHRONOUS, result),
       next_proto_status(SSLClientSocket::kNextProtoUnsupported),
       was_npn_negotiated(false),
       protocol_negotiated(SSLClientSocket::kProtoUnknown),
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index 547a807..bc5f777 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -53,10 +53,15 @@ class SSLClientSocket;
 class SSLHostInfo;
 class StreamSocket;
 
+enum ConnectMode {
+  ASYNC,
+  SYNCHRONOUS
+};
+
 struct MockConnect {
   // Asynchronous connection success.
   MockConnect() : async(true), result(OK) { }
-  MockConnect(bool a, int r) : async(a), result(r) { }
+  MockConnect(ConnectMode m, int r) : async(m == ASYNC), result(r) { }
 
   bool async;
   int result;
diff --git a/net/socket/socks_client_socket_pool_unittest.cc b/net/socket/socks_client_socket_pool_unittest.cc
index 28706ea..800b97a 100644
--- a/net/socket/socks_client_socket_pool_unittest.cc
+++ b/net/socket/socks_client_socket_pool_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -97,7 +97,7 @@ class SOCKSClientSocketPoolTest : public testing::Test {
 
 TEST_F(SOCKSClientSocketPoolTest, Simple) {
   SOCKS5MockData data(false);
-  data.data_provider()->set_connect_data(MockConnect(false, 0));
+  data.data_provider()->set_connect_data(MockConnect(SYNCHRONOUS, OK));
   transport_client_socket_factory_.AddSocketDataProvider(data.data_provider());
 
   ClientSocketHandle handle;
@@ -127,7 +127,8 @@ TEST_F(SOCKSClientSocketPoolTest, Async) {
 
 TEST_F(SOCKSClientSocketPoolTest, TransportConnectError) {
   scoped_ptr<SocketDataProvider> socket_data(new StaticSocketDataProvider());
-  socket_data->set_connect_data(MockConnect(false, ERR_CONNECTION_REFUSED));
+  socket_data->set_connect_data(MockConnect(SYNCHRONOUS,
+                                            ERR_CONNECTION_REFUSED));
   transport_client_socket_factory_.AddSocketDataProvider(socket_data.get());
 
   ClientSocketHandle handle;
@@ -140,7 +141,7 @@ TEST_F(SOCKSClientSocketPoolTest, TransportConnectError) {
 
 TEST_F(SOCKSClientSocketPoolTest, AsyncTransportConnectError) {
   scoped_ptr<SocketDataProvider> socket_data(new StaticSocketDataProvider());
-  socket_data->set_connect_data(MockConnect(true, ERR_CONNECTION_REFUSED));
+  socket_data->set_connect_data(MockConnect(ASYNC, ERR_CONNECTION_REFUSED));
   transport_client_socket_factory_.AddSocketDataProvider(socket_data.get());
 
   TestCompletionCallback callback;
@@ -162,7 +163,7 @@ TEST_F(SOCKSClientSocketPoolTest, SOCKSConnectError) {
   };
   scoped_ptr<SocketDataProvider> socket_data(new StaticSocketDataProvider(
         failed_read, arraysize(failed_read), NULL, 0));
-  socket_data->set_connect_data(MockConnect(false, 0));
+  socket_data->set_connect_data(MockConnect(SYNCHRONOUS, OK));
   transport_client_socket_factory_.AddSocketDataProvider(socket_data.get());
 
   ClientSocketHandle handle;
@@ -181,7 +182,7 @@ TEST_F(SOCKSClientSocketPoolTest, AsyncSOCKSConnectError) {
   };
   scoped_ptr<SocketDataProvider> socket_data(new StaticSocketDataProvider(
         failed_read, arraysize(failed_read), NULL, 0));
-  socket_data->set_connect_data(MockConnect(false, 0));
+  socket_data->set_connect_data(MockConnect(SYNCHRONOUS, OK));
   transport_client_socket_factory_.AddSocketDataProvider(socket_data.get());
 
   TestCompletionCallback callback;
@@ -233,12 +234,12 @@ TEST_F(SOCKSClientSocketPoolTest, CancelDuringTransportConnect) {
 
 TEST_F(SOCKSClientSocketPoolTest, CancelDuringSOCKSConnect) {
   SOCKS5MockData data(true);
-  data.data_provider()->set_connect_data(MockConnect(false, 0));
+  data.data_provider()->set_connect_data(MockConnect(SYNCHRONOUS, OK));
   transport_client_socket_factory_.AddSocketDataProvider(data.data_provider());
   // We need two connections because the pool base lets one cancelled
   // connect job proceed for potential future use.
   SOCKS5MockData data2(true);
-  data2.data_provider()->set_connect_data(MockConnect(false, 0));
+  data2.data_provider()->set_connect_data(MockConnect(SYNCHRONOUS, OK));
   transport_client_socket_factory_.AddSocketDataProvider(data2.data_provider());
 
   EXPECT_EQ(0, transport_socket_pool_.cancel_count());
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc
index c751a4a..96ebc7b 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -174,7 +174,7 @@ class SSLClientSocketPoolTest : public testing::Test {
 
 TEST_F(SSLClientSocketPoolTest, TCPFail) {
   StaticSocketDataProvider data;
-  data.set_connect_data(MockConnect(false, ERR_CONNECTION_FAILED));
+  data.set_connect_data(MockConnect(SYNCHRONOUS, ERR_CONNECTION_FAILED));
   socket_factory_.AddSocketDataProvider(&data);
 
   CreatePool(true /* tcp pool */, false, false);
@@ -192,7 +192,7 @@ TEST_F(SSLClientSocketPoolTest, TCPFail) {
 
 TEST_F(SSLClientSocketPoolTest, TCPFailAsync) {
   StaticSocketDataProvider data;
-  data.set_connect_data(MockConnect(true, ERR_CONNECTION_FAILED));
+  data.set_connect_data(MockConnect(ASYNC, ERR_CONNECTION_FAILED));
   socket_factory_.AddSocketDataProvider(&data);
 
   CreatePool(true /* tcp pool */, false, false);
@@ -215,7 +215,7 @@ TEST_F(SSLClientSocketPoolTest, TCPFailAsync) {
 
 TEST_F(SSLClientSocketPoolTest, BasicDirect) {
   StaticSocketDataProvider data;
-  data.set_connect_data(MockConnect(false, OK));
+  data.set_connect_data(MockConnect(SYNCHRONOUS, OK));
   socket_factory_.AddSocketDataProvider(&data);
   SSLSocketDataProvider ssl(false, OK);
   socket_factory_.AddSSLSocketDataProvider(&ssl);
@@ -428,7 +428,7 @@ TEST_F(SSLClientSocketPoolTest, DirectGotBonusSPDY) {
 
 TEST_F(SSLClientSocketPoolTest, SOCKSFail) {
   StaticSocketDataProvider data;
-  data.set_connect_data(MockConnect(false, ERR_CONNECTION_FAILED));
+  data.set_connect_data(MockConnect(SYNCHRONOUS, ERR_CONNECTION_FAILED));
   socket_factory_.AddSocketDataProvider(&data);
 
   CreatePool(false, true /* http proxy pool */, true /* socks pool */);
@@ -447,7 +447,7 @@ TEST_F(SSLClientSocketPoolTest, SOCKSFail) {
 
 TEST_F(SSLClientSocketPoolTest, SOCKSFailAsync) {
   StaticSocketDataProvider data;
-  data.set_connect_data(MockConnect(true, ERR_CONNECTION_FAILED));
+  data.set_connect_data(MockConnect(ASYNC, ERR_CONNECTION_FAILED));
   socket_factory_.AddSocketDataProvider(&data);
 
   CreatePool(false, true /* http proxy pool */, true /* socks pool */);
@@ -470,7 +470,7 @@ TEST_F(SSLClientSocketPoolTest, SOCKSFailAsync) {
 
 TEST_F(SSLClientSocketPoolTest, SOCKSBasic) {
   StaticSocketDataProvider data;
-  data.set_connect_data(MockConnect(false, OK));
+  data.set_connect_data(MockConnect(SYNCHRONOUS, OK));
   socket_factory_.AddSocketDataProvider(&data);
   SSLSocketDataProvider ssl(false, OK);
   socket_factory_.AddSSLSocketDataProvider(&ssl);
@@ -513,7 +513,7 @@ TEST_F(SSLClientSocketPoolTest, SOCKSBasicAsync) {
 
 TEST_F(SSLClientSocketPoolTest, HttpProxyFail) {
   StaticSocketDataProvider data;
-  data.set_connect_data(MockConnect(false, ERR_CONNECTION_FAILED));
+  data.set_connect_data(MockConnect(SYNCHRONOUS, ERR_CONNECTION_FAILED));
   socket_factory_.AddSocketDataProvider(&data);
 
   CreatePool(false, true /* http proxy pool */, true /* socks pool */);
@@ -532,7 +532,7 @@ TEST_F(SSLClientSocketPoolTest, HttpProxyFail) {
 
 TEST_F(SSLClientSocketPoolTest, HttpProxyFailAsync) {
   StaticSocketDataProvider data;
-  data.set_connect_data(MockConnect(true, ERR_CONNECTION_FAILED));
+  data.set_connect_data(MockConnect(ASYNC, ERR_CONNECTION_FAILED));
   socket_factory_.AddSocketDataProvider(&data);
 
   CreatePool(false, true /* http proxy pool */, true /* socks pool */);
@@ -566,7 +566,7 @@ TEST_F(SSLClientSocketPoolTest, HttpProxyBasic) {
   };
   StaticSocketDataProvider data(reads, arraysize(reads), writes,
                                 arraysize(writes));
-  data.set_connect_data(MockConnect(false, OK));
+  data.set_connect_data(MockConnect(SYNCHRONOUS, OK));
   socket_factory_.AddSocketDataProvider(&data);
   AddAuthToCache();
   SSLSocketDataProvider ssl(false, OK);
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index e750208..bf00bf4 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -243,7 +243,7 @@ class SpdyNetworkTransactionTest
         session_deps_->socket_factory->AddSSLSocketDataProvider(ssl_.get());
       session_deps_->socket_factory->AddSocketDataProvider(data);
       if (test_type_ == SPDYNPN) {
-        MockConnect never_finishing_connect(false, ERR_IO_PENDING);
+        MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
         linked_ptr<StaticSocketDataProvider>
             hanging_non_alternate_protocol_socket(
                 new StaticSocketDataProvider(NULL, 0, NULL, 0));
@@ -273,7 +273,7 @@ class SpdyNetworkTransactionTest
       }
       session_deps_->deterministic_socket_factory->AddSocketDataProvider(data);
       if (test_type_ == SPDYNPN) {
-        MockConnect never_finishing_connect(false, ERR_IO_PENDING);
+        MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
         scoped_refptr<DeterministicSocketData>
             hanging_non_alternate_protocol_socket(
             new DeterministicSocketData(NULL, 0, NULL, 0));
@@ -758,7 +758,7 @@ TEST_P(SpdyNetworkTransactionTest, TwoGetsLateBinding) {
       new OrderedSocketData(reads, arraysize(reads),
                             writes, arraysize(writes)));
 
-  MockConnect never_finishing_connect(false, ERR_IO_PENDING);
+  MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
 
   scoped_ptr<OrderedSocketData> data_placeholder(
       new OrderedSocketData(NULL, 0, NULL, 0));
@@ -845,7 +845,7 @@ TEST_P(SpdyNetworkTransactionTest, TwoGetsLateBindingFromPreconnect) {
       new OrderedSocketData(reads, arraysize(reads),
                             writes, arraysize(writes)));
 
-  MockConnect never_finishing_connect(true, ERR_IO_PENDING);
+  MockConnect never_finishing_connect(ASYNC, ERR_IO_PENDING);
 
   scoped_ptr<OrderedSocketData> data_placeholder(
       new OrderedSocketData(NULL, 0, NULL, 0));
diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc
index 1357b7d..ae13606 100644
--- a/net/spdy/spdy_proxy_client_socket_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -131,7 +131,7 @@ SpdyProxyClientSocketTest::SpdyProxyClientSocketTest()
       session_(NULL),
       read_buf_(NULL),
       session_deps_(),
-      connect_data_(false, OK),
+      connect_data_(SYNCHRONOUS, OK),
       spdy_session_(NULL),
       spdy_stream_(NULL),
       framer_(),
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
index ad26d26..889ab52 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -108,7 +108,7 @@ TEST_F(SpdySessionTest, GoAway) {
   SpdySessionDependencies session_deps;
   session_deps.host_resolver->set_synchronous_mode(true);
 
-  MockConnect connect_data(false, OK);
+  MockConnect connect_data(SYNCHRONOUS, OK);
   scoped_ptr<spdy::SpdyFrame> goaway(ConstructSpdyGoAway());
   MockRead reads[] = {
     CreateMockRead(*goaway),
@@ -167,7 +167,7 @@ TEST_F(SpdySessionTest, Ping) {
   SpdySessionDependencies session_deps;
   session_deps.host_resolver->set_synchronous_mode(true);
 
-  MockConnect connect_data(false, OK);
+  MockConnect connect_data(SYNCHRONOUS, OK);
   scoped_ptr<spdy::SpdyFrame> read_ping(ConstructSpdyPing());
   MockRead reads[] = {
     CreateMockRead(*read_ping),
@@ -258,7 +258,7 @@ TEST_F(SpdySessionTest, FailedPing) {
   SpdySessionDependencies session_deps;
   session_deps.host_resolver->set_synchronous_mode(true);
 
-  MockConnect connect_data(false, OK);
+  MockConnect connect_data(SYNCHRONOUS, OK);
   scoped_ptr<spdy::SpdyFrame> read_ping(ConstructSpdyPing());
   MockRead reads[] = {
     CreateMockRead(*read_ping),
@@ -501,7 +501,7 @@ TEST_F(SpdySessionTest, OnSettings) {
 
   // Set up the socket so we read a SETTINGS frame that raises max concurrent
   // streams to 2.
-  MockConnect connect_data(false, OK);
+  MockConnect connect_data(SYNCHRONOUS, OK);
   scoped_ptr<spdy::SpdyFrame> settings_frame(
       ConstructSpdySettings(new_settings));
   MockRead reads[] = {
@@ -590,7 +590,7 @@ TEST_F(SpdySessionTest, CancelPendingCreateStream) {
   };
 
   StaticSocketDataProvider data(reads, arraysize(reads), NULL, 0);
-  MockConnect connect_data(false, OK);
+  MockConnect connect_data(SYNCHRONOUS, OK);
 
   data.set_connect_data(connect_data);
   session_deps.socket_factory->AddSocketDataProvider(&data);
@@ -686,7 +686,7 @@ TEST_F(SpdySessionTest, SendSettingsOnNewSession) {
   id.set_id(kBogusSettingId);
   id.set_flags(spdy::SETTINGS_FLAG_PERSISTED);
   settings.push_back(spdy::SpdySetting(id, kBogusSettingValue));
-  MockConnect connect_data(false, OK);
+  MockConnect connect_data(SYNCHRONOUS, OK);
   scoped_ptr<spdy::SpdyFrame> settings_frame(
       ConstructSpdySettings(settings));
   MockWrite writes[] = {
@@ -770,7 +770,7 @@ void IPPoolingTest(bool clean_via_close_current_sessions) {
         HostPortPair(test_hosts[i].name, kTestPort), ProxyServer::Direct());
   }
 
-  MockConnect connect_data(false, OK);
+  MockConnect connect_data(SYNCHRONOUS, OK);
   MockRead reads[] = {
     MockRead(false, ERR_IO_PENDING)  // Stall forever.
   };
@@ -910,7 +910,7 @@ TEST_F(SpdySessionTest, ClearSettingsStorageOnIPAddressChanged) {
 TEST_F(SpdySessionTest, NeedsCredentials) {
   SpdySessionDependencies session_deps;
 
-  MockConnect connect_data(false, OK);
+  MockConnect connect_data(SYNCHRONOUS, OK);
   MockRead reads[] = {
     MockRead(false, ERR_IO_PENDING)  // Stall forever.
   };
@@ -978,7 +978,7 @@ TEST_F(SpdySessionTest, NeedsCredentials) {
 TEST_F(SpdySessionTest, SendCredentials) {
   SpdySessionDependencies session_deps;
 
-  MockConnect connect_data(false, OK);
+  MockConnect connect_data(SYNCHRONOUS, OK);
   MockRead reads[] = {
     MockRead(false, ERR_IO_PENDING)  // Stall forever.
   };
diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc
index b745fd0..e3e9b0a 100644
--- a/net/spdy/spdy_stream_unittest.cc
+++ b/net/spdy/spdy_stream_unittest.cc
@@ -173,7 +173,7 @@ TEST_F(SpdyStreamTest, SendDataAfterOpen) {
   scoped_ptr<OrderedSocketData> data(
       new OrderedSocketData(reads, arraysize(reads),
                             writes, arraysize(writes)));
-  MockConnect connect_data(false, OK);
+  MockConnect connect_data(SYNCHRONOUS, OK);
   data->set_connect_data(connect_data);
 
   session_deps.socket_factory->AddSocketDataProvider(data.get());
diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc
index e6243a0..7ce33b9 100644
--- a/net/websockets/websocket_job_unittest.cc
+++ b/net/websockets/websocket_job_unittest.cc
@@ -258,7 +258,7 @@ class MockHttpTransactionFactory : public net::HttpTransactionFactory {
  public:
   MockHttpTransactionFactory(net::OrderedSocketData* data) {
     data_ = data;
-    net::MockConnect connect_data(false, net::OK);
+    net::MockConnect connect_data(net::SYNCHRONOUS, net::OK);
     data_->set_connect_data(connect_data);
     session_deps_.reset(new net::SpdySessionDependencies);
     session_deps_->socket_factory->AddSocketDataProvider(data_);