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

jingle/notifier/base/chrome_async_socket_unittest.cc

 // Copyright (c) 2011 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.
 
 #include "jingle/notifier/base/chrome_async_socket.h"
 
 #include <deque>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 324 matching lines @@
     ExpectSignalSocketState(
         SignalSocketState::NoError(
             SIGNAL_READ, ChromeAsyncSocket::STATE_TLS_OPEN));
   }
 
   // Open/close utility functions.
 
   void DoOpenClosed() {
     ExpectClosed();
     async_socket_data_provider_.set_connect_data(
-        net::MockConnect(false, net::OK));
+        net::MockConnect(net::SYNCHRONOUS, net::OK));
     EXPECT_TRUE(chrome_async_socket_->Connect(addr_));
     ExpectNonErrorState(ChromeAsyncSocket::STATE_CONNECTING);
 
     message_loop_.RunAllPending();
     // We may not necessarily be open; may have been other events
     // queued up.
     ExpectSignalSocketState(
         SignalSocketState::NoError(
             SIGNAL_CONNECT, ChromeAsyncSocket::STATE_OPEN));
   }
@@ skipping 156 matching lines @@
 
   EXPECT_TRUE(chrome_async_socket_->Close());
   ExpectClosed();
   ExpectSignalSocketState(
       SignalSocketState::NoError(
           SIGNAL_CLOSE, ChromeAsyncSocket::STATE_CLOSED));
 }
 
 TEST_F(ChromeAsyncSocketTest, PendingConnect) {
   async_socket_data_provider_.set_connect_data(
-      net::MockConnect(true, net::OK));
+      net::MockConnect(net::ASYNC, net::OK));
   EXPECT_TRUE(chrome_async_socket_->Connect(addr_));
   ExpectNonErrorState(ChromeAsyncSocket::STATE_CONNECTING);
   ExpectNoSignal();
 
   message_loop_.RunAllPending();
   ExpectNonErrorState(ChromeAsyncSocket::STATE_OPEN);
   ExpectSignalSocketState(
       SignalSocketState::NoError(
           SIGNAL_CONNECT, ChromeAsyncSocket::STATE_OPEN));
   ExpectNoSignal();
 
   message_loop_.RunAllPending();
 
   DoCloseOpenedNoError();
 }
 
 // After this no need to test successful pending connect so
 // thoroughly.
 
 TEST_F(ChromeAsyncSocketTest, PendingConnectCloseBeforeRead) {
   async_socket_data_provider_.set_connect_data(
-      net::MockConnect(true, net::OK));
+      net::MockConnect(net::ASYNC, net::OK));
   EXPECT_TRUE(chrome_async_socket_->Connect(addr_));
 
   message_loop_.RunAllPending();
   ExpectSignalSocketState(
       SignalSocketState::NoError(
           SIGNAL_CONNECT, ChromeAsyncSocket::STATE_OPEN));
 
   DoCloseOpenedNoError();
 
   message_loop_.RunAllPending();
 }
 
 TEST_F(ChromeAsyncSocketTest, PendingConnectError) {
   async_socket_data_provider_.set_connect_data(
-      net::MockConnect(true, net::ERR_TIMED_OUT));
+      net::MockConnect(net::ASYNC, net::ERR_TIMED_OUT));
   EXPECT_TRUE(chrome_async_socket_->Connect(addr_));
 
   message_loop_.RunAllPending();
 
   ExpectSignalSocketState(
       SignalSocketState(
           SIGNAL_CLOSE, ChromeAsyncSocket::STATE_CLOSED,
           ChromeAsyncSocket::ERROR_WINSOCK, net::ERR_TIMED_OUT));
 }
 
 // After this we can assume Connect() and Close() work as expected.
 
 TEST_F(ChromeAsyncSocketTest, EmptyRead) {
   DoOpenClosed();
 
   char buf[4096];
   size_t len_read = 10000U;
   EXPECT_TRUE(chrome_async_socket_->Read(buf, sizeof(buf), &len_read));
   EXPECT_EQ(0U, len_read);
 
   DoCloseOpenedNoError();
 }
 
 TEST_F(ChromeAsyncSocketTest, WrongRead) {
   EXPECT_DEBUG_DEATH({
     async_socket_data_provider_.set_connect_data(
-        net::MockConnect(true, net::OK));
+        net::MockConnect(net::ASYNC, net::OK));
     EXPECT_TRUE(chrome_async_socket_->Connect(addr_));
     ExpectNonErrorState(ChromeAsyncSocket::STATE_CONNECTING);
     ExpectNoSignal();
 
     char buf[4096];
     size_t len_read;
     EXPECT_FALSE(chrome_async_socket_->Read(buf, sizeof(buf), &len_read));
     ExpectErrorState(ChromeAsyncSocket::STATE_CONNECTING,
                      ChromeAsyncSocket::ERROR_WRONGSTATE);
     EXPECT_TRUE(chrome_async_socket_->Close());
@@ skipping 293 matching lines @@
     DoSSLCloseOpened(
         SignalSocketState(SIGNAL_CLOSE,
                           ChromeAsyncSocket::STATE_CLOSED,
                           ChromeAsyncSocket::ERROR_WRONGSTATE,
                           net::OK));
   }, "wrong state");
 }
 
 TEST_F(ChromeAsyncSocketTest, FailedSSLConnect) {
   ssl_socket_data_provider_.connect =
-      net::MockConnect(true, net::ERR_CERT_COMMON_NAME_INVALID),
+      net::MockConnect(net::ASYNC, net::ERR_CERT_COMMON_NAME_INVALID),
 
   async_socket_data_provider_.AddRead(net::MockRead(kReadData));
   DoOpenClosed();
   ExpectReadSignal();
 
   EXPECT_TRUE(chrome_async_socket_->StartTls("fakedomain.com"));
   message_loop_.RunAllPending();
   ExpectSignalSocketState(
       SignalSocketState(
           SIGNAL_CLOSE, ChromeAsyncSocket::STATE_CLOSED,
@@ skipping 153 matching lines @@
   message_loop_.RunAllPending();
 
   ExpectNoSignal();
 
   DoSSLCloseOpenedNoError();
 }
 
 }  // namespace
 
 }  // namespace notifier