Change MockRead and MockWrite (et. al.) to take an IoMode enum, instead
of a bool async.
Review URL: http://codereview.chromium.org/9425016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123274 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc
index 1a6db28..559b373 100644
--- a/net/socket/socks_client_socket_unittest.cc
+++ b/net/socket/socks_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.
@@ -127,11 +127,11 @@
const std::string payload_read = "moar random data";
MockWrite data_writes[] = {
- MockWrite(true, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)),
- MockWrite(true, payload_write.data(), payload_write.size()) };
+ MockWrite(ASYNC, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)),
+ MockWrite(ASYNC, payload_write.data(), payload_write.size()) };
MockRead data_reads[] = {
- MockRead(true, kSOCKSOkReply, arraysize(kSOCKSOkReply)),
- MockRead(true, payload_read.data(), payload_read.size()) };
+ MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply)),
+ MockRead(ASYNC, payload_read.data(), payload_read.size()) };
CapturingNetLog log(CapturingNetLog::kUnbounded);
user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
@@ -202,9 +202,10 @@
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
MockWrite data_writes[] = {
- MockWrite(false, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) };
+ MockWrite(SYNCHRONOUS, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) };
MockRead data_reads[] = {
- MockRead(false, tests[i].fail_reply, arraysize(tests[i].fail_reply)) };
+ MockRead(SYNCHRONOUS, tests[i].fail_reply,
+ arraysize(tests[i].fail_reply)) };
CapturingNetLog log(CapturingNetLog::kUnbounded);
user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
@@ -238,10 +239,10 @@
const char kSOCKSPartialReply2[] = { 0x5A, 0x00, 0x00, 0, 0, 0, 0 };
MockWrite data_writes[] = {
- MockWrite(true, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) };
+ MockWrite(ASYNC, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) };
MockRead data_reads[] = {
- MockRead(true, kSOCKSPartialReply1, arraysize(kSOCKSPartialReply1)),
- MockRead(true, kSOCKSPartialReply2, arraysize(kSOCKSPartialReply2)) };
+ MockRead(ASYNC, kSOCKSPartialReply1, arraysize(kSOCKSPartialReply1)),
+ MockRead(ASYNC, kSOCKSPartialReply2, arraysize(kSOCKSPartialReply2)) };
CapturingNetLog log(CapturingNetLog::kUnbounded);
user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
@@ -272,14 +273,14 @@
const char kSOCKSPartialRequest2[] = { 0x00, 0x50, 127, 0, 0, 1, 0 };
MockWrite data_writes[] = {
- MockWrite(true, arraysize(kSOCKSPartialRequest1)),
+ MockWrite(ASYNC, arraysize(kSOCKSPartialRequest1)),
// simulate some empty writes
- MockWrite(true, 0),
- MockWrite(true, 0),
- MockWrite(true, kSOCKSPartialRequest2,
+ MockWrite(ASYNC, 0),
+ MockWrite(ASYNC, 0),
+ MockWrite(ASYNC, kSOCKSPartialRequest2,
arraysize(kSOCKSPartialRequest2)) };
MockRead data_reads[] = {
- MockRead(true, kSOCKSOkReply, arraysize(kSOCKSOkReply)) };
+ MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply)) };
CapturingNetLog log(CapturingNetLog::kUnbounded);
user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
@@ -307,11 +308,11 @@
// and closes the connection.
TEST_F(SOCKSClientSocketTest, FailedSocketRead) {
MockWrite data_writes[] = {
- MockWrite(true, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) };
+ MockWrite(ASYNC, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) };
MockRead data_reads[] = {
- MockRead(true, kSOCKSOkReply, arraysize(kSOCKSOkReply) - 2),
+ MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply) - 2),
// close connection unexpectedly
- MockRead(false, 0) };
+ MockRead(SYNCHRONOUS, 0) };
CapturingNetLog log(CapturingNetLog::kUnbounded);
user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
@@ -372,8 +373,8 @@
new HangingHostResolverWithCancel());
// Doesn't matter what the socket data is, we will never use it -- garbage.
- MockWrite data_writes[] = { MockWrite(false, "", 0) };
- MockRead data_reads[] = { MockRead(false, "", 0) };
+ MockWrite data_writes[] = { MockWrite(SYNCHRONOUS, "", 0) };
+ MockRead data_reads[] = { MockRead(SYNCHRONOUS, "", 0) };
user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
data_writes, arraysize(data_writes),
