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

jingle/notifier/base/fake_ssl_client_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/fake_ssl_client_socket.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 113 matching lines @@
   // (sliced up according to the parameters) and makes sure the
   // FakeSSLClientSocket behaves as expected.
   void RunSuccessfulHandshakeTest(
       bool async, size_t read_chunk_size, size_t write_chunk_size,
       int num_resets) {
     base::StringPiece ssl_client_hello =
         FakeSSLClientSocket::GetSslClientHello();
     base::StringPiece ssl_server_hello =
         FakeSSLClientSocket::GetSslServerHello();
 
-    net::MockConnect mock_connect(async, net::OK);
+    net::MockConnect mock_connect(async ? net::ASYNC : net::SYNCHRONOUS,

[akalin, 2012/02/17 19:46:49]

ideally you'd propagate the enum up, but that's not critical

[Ryan Hamilton, 2012/02/17 19:58:09]

Yup, I intend to do that in a subsequent CL, coming soon...

+                                  net::OK);
     std::vector<net::MockRead> reads;
     std::vector<net::MockWrite> writes;
     static const char kReadTestData[] = "read test data";
     static const char kWriteTestData[] = "write test data";
     for (int i = 0; i < num_resets + 1; ++i) {
       SCOPED_TRACE(i);
       AddChunkedOps(ssl_server_hello, read_chunk_size, async, &reads);
       AddChunkedOps(ssl_client_hello, write_chunk_size, async, &writes);
       reads.push_back(
           net::MockRead(async, kReadTestData, arraysize(kReadTestData)));
@@ skipping 40 matching lines @@
   // Sets up the mock socket to generate an unsuccessful handshake
   // FakeSSLClientSocket fails as expected.
   void RunUnsuccessfulHandshakeTestHelper(
       bool async, int error, HandshakeErrorLocation location) {
     DCHECK_NE(error, net::OK);
     base::StringPiece ssl_client_hello =
         FakeSSLClientSocket::GetSslClientHello();
     base::StringPiece ssl_server_hello =
         FakeSSLClientSocket::GetSslServerHello();
 
-    net::MockConnect mock_connect(async, net::OK);
+    net::MockConnect mock_connect(async ? net::ASYNC : net::SYNCHRONOUS,
+                                  net::OK);
     std::vector<net::MockRead> reads;
     std::vector<net::MockWrite> writes;
     const size_t kChunkSize = 1;
     AddChunkedOps(ssl_server_hello, kChunkSize, async, &reads);
     AddChunkedOps(ssl_client_hello, kChunkSize, async, &writes);
     switch (location) {
       case CONNECT_ERROR:
         mock_connect.result = error;
         writes.clear();
         reads.clear();
@@ skipping 133 matching lines @@
 }
 
 TEST_F(FakeSSLClientSocketTest, MalformedServerHello) {
   RunUnsuccessfulHandshakeTest(ERR_MALFORMED_SERVER_HELLO,
                                VERIFY_SERVER_HELLO_ERROR);
 }
 
 }  // namespace
 
 }  // namespace notifier