Change MockRead and MockWrite (et. al.) to take an IoMode enum, instead

net/socket/socks5_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 "net/socket/socks5_client_socket.h"
 
 #include <algorithm>
 #include <map>
 
 #include "net/base/address_list.h"
@@ skipping 97 matching lines @@
     0x01,  // Command (CONNECT)
     0x00,  // Reserved.
     0x03,  // Address type (DOMAINNAME).
     0x09,  // Length of domain (9)
     // Domain string:
     'l', 'o', 'c', 'a', 'l', 'h', 'o', 's', 't',
     0x00, 0x50,  // 16-bit port (80)
   };
 
   MockWrite data_writes[] = {
-      MockWrite(true, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
-      MockWrite(true, kOkRequest, arraysize(kOkRequest)),
-      MockWrite(true, payload_write.data(), payload_write.size()) };
+      MockWrite(ASYNC, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
+      MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest)),
+      MockWrite(ASYNC, payload_write.data(), payload_write.size()) };
   MockRead data_reads[] = {
-      MockRead(true, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
-      MockRead(true, kSOCKS5OkResponse, kSOCKS5OkResponseLength),
-      MockRead(true, payload_read.data(), payload_read.size()) };
+      MockRead(ASYNC, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
+      MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength),
+      MockRead(ASYNC, payload_read.data(), payload_read.size()) };
 
   user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
                                    data_writes, arraysize(data_writes),
                                    "localhost", 80, &net_log_));
 
   // At this state the TCP connection is completed but not the SOCKS handshake.
   EXPECT_TRUE(tcp_sock_->IsConnected());
   EXPECT_FALSE(user_sock_->IsConnected());
 
   int rv = user_sock_->Connect(callback_.callback());
@@ skipping 43 matching lines @@
       0x03,  // ATYPE
   };
 
   std::string request(kSOCKS5DomainRequest, arraysize(kSOCKS5DomainRequest));
   request.push_back(hostname.size());
   request.append(hostname);
   request.append(reinterpret_cast<const char*>(&kNwPort), sizeof(kNwPort));
 
   for (int i = 0; i < 2; ++i) {
     MockWrite data_writes[] = {
-        MockWrite(false, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
-        MockWrite(false, request.data(), request.size())
+        MockWrite(SYNCHRONOUS, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
+        MockWrite(SYNCHRONOUS, request.data(), request.size())
     };
     MockRead data_reads[] = {
-        MockRead(false, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
-        MockRead(false, kSOCKS5OkResponse, kSOCKS5OkResponseLength)
+        MockRead(SYNCHRONOUS, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
+        MockRead(SYNCHRONOUS, kSOCKS5OkResponse, kSOCKS5OkResponseLength)
     };
 
     user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
                                      data_writes, arraysize(data_writes),
                                      hostname, 80, NULL));
 
     int rv = user_sock_->Connect(callback_.callback());
     EXPECT_EQ(OK, rv);
     EXPECT_TRUE(user_sock_->IsConnected());
 
@@ skipping 34 matching lines @@
     // Domain string:
     'w', 'w', 'w', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'c', 'o', 'm',
     0x00, 0x50,  // 16-bit port (80)
   };
 
   // Test for partial greet request write
   {
     const char partial1[] = { 0x05, 0x01 };
     const char partial2[] = { 0x00 };
     MockWrite data_writes[] = {
-        MockWrite(true, arraysize(partial1)),
-        MockWrite(true, partial2, arraysize(partial2)),
-        MockWrite(true, kOkRequest, arraysize(kOkRequest)) };
+        MockWrite(ASYNC, arraysize(partial1)),
+        MockWrite(ASYNC, partial2, arraysize(partial2)),
+        MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest)) };
     MockRead data_reads[] = {
-        MockRead(true, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
-        MockRead(true, kSOCKS5OkResponse, kSOCKS5OkResponseLength) };
+        MockRead(ASYNC, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
+        MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength) };
     user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
                                      data_writes, arraysize(data_writes),
                                      hostname, 80, &net_log_));
     int rv = user_sock_->Connect(callback_.callback());
     EXPECT_EQ(ERR_IO_PENDING, rv);
 
     net::CapturingNetLog::EntryList net_log_entries;
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,
                 NetLog::TYPE_SOCKS5_CONNECT));
 
     rv = callback_.WaitForResult();
     EXPECT_EQ(OK, rv);
     EXPECT_TRUE(user_sock_->IsConnected());
 
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
                 NetLog::TYPE_SOCKS5_CONNECT));
   }
 
   // Test for partial greet response read
   {
     const char partial1[] = { 0x05 };
     const char partial2[] = { 0x00 };
     MockWrite data_writes[] = {
-        MockWrite(true, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
-        MockWrite(true, kOkRequest, arraysize(kOkRequest)) };
+        MockWrite(ASYNC, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
+        MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest)) };
     MockRead data_reads[] = {
-        MockRead(true, partial1, arraysize(partial1)),
-        MockRead(true, partial2, arraysize(partial2)),
-        MockRead(true, kSOCKS5OkResponse, kSOCKS5OkResponseLength) };
+        MockRead(ASYNC, partial1, arraysize(partial1)),
+        MockRead(ASYNC, partial2, arraysize(partial2)),
+        MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength) };
     user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
                                      data_writes, arraysize(data_writes),
                                      hostname, 80, &net_log_));
     int rv = user_sock_->Connect(callback_.callback());
     EXPECT_EQ(ERR_IO_PENDING, rv);
 
     net::CapturingNetLog::EntryList net_log_entries;
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,
                                       NetLog::TYPE_SOCKS5_CONNECT));
     rv = callback_.WaitForResult();
     EXPECT_EQ(OK, rv);
     EXPECT_TRUE(user_sock_->IsConnected());
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
                                     NetLog::TYPE_SOCKS5_CONNECT));
   }
 
   // Test for partial handshake request write.
   {
     const int kSplitPoint = 3;  // Break handshake write into two parts.
     MockWrite data_writes[] = {
-        MockWrite(true, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
-        MockWrite(true, kOkRequest, kSplitPoint),
-        MockWrite(true, kOkRequest + kSplitPoint,
+        MockWrite(ASYNC, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
+        MockWrite(ASYNC, kOkRequest, kSplitPoint),
+        MockWrite(ASYNC, kOkRequest + kSplitPoint,
                   arraysize(kOkRequest) - kSplitPoint)
     };
     MockRead data_reads[] = {
-        MockRead(true, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
-        MockRead(true, kSOCKS5OkResponse, kSOCKS5OkResponseLength) };
+        MockRead(ASYNC, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
+        MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength) };
     user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
                                      data_writes, arraysize(data_writes),
                                      hostname, 80, &net_log_));
     int rv = user_sock_->Connect(callback_.callback());
     EXPECT_EQ(ERR_IO_PENDING, rv);
     net::CapturingNetLog::EntryList net_log_entries;
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,
                                       NetLog::TYPE_SOCKS5_CONNECT));
     rv = callback_.WaitForResult();
     EXPECT_EQ(OK, rv);
     EXPECT_TRUE(user_sock_->IsConnected());
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
                                     NetLog::TYPE_SOCKS5_CONNECT));
   }
 
   // Test for partial handshake response read
   {
     const int kSplitPoint = 6;  // Break the handshake read into two parts.
     MockWrite data_writes[] = {
-        MockWrite(true, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
-        MockWrite(true, kOkRequest, arraysize(kOkRequest))
+        MockWrite(ASYNC, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
+        MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest))
     };
     MockRead data_reads[] = {
-        MockRead(true, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
-        MockRead(true, kSOCKS5OkResponse, kSplitPoint),
-        MockRead(true, kSOCKS5OkResponse + kSplitPoint,
+        MockRead(ASYNC, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
+        MockRead(ASYNC, kSOCKS5OkResponse, kSplitPoint),
+        MockRead(ASYNC, kSOCKS5OkResponse + kSplitPoint,
                  kSOCKS5OkResponseLength - kSplitPoint)
     };
 
     user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
                                      data_writes, arraysize(data_writes),
                                      hostname, 80, &net_log_));
     int rv = user_sock_->Connect(callback_.callback());
     EXPECT_EQ(ERR_IO_PENDING, rv);
     net::CapturingNetLog::EntryList net_log_entries;
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,
                                       NetLog::TYPE_SOCKS5_CONNECT));
     rv = callback_.WaitForResult();
     EXPECT_EQ(OK, rv);
     EXPECT_TRUE(user_sock_->IsConnected());
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
                                     NetLog::TYPE_SOCKS5_CONNECT));
   }
 }
 
 }  // namespace
 
 }  // namespace net