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

net/websockets/websocket_job_unittest.cc

 // 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.
 
 #include "net/websockets/websocket_job.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 789 matching lines @@
 // OrderedSocketData provide socket level verifiation by checking out-going
 // packets in comparison with the MockWrite array and emulating in-coming
 // packets with MockRead array.
 
 void WebSocketJobTest::TestConnectByWebSocket(ThrottlingOption throttling) {
   // This is a test for verifying cooperation between WebSocketJob and
   // SocketStream. If |throttling| was |THROTTLING_OFF|, it test basic
   // situation. If |throttling| was |THROTTLING_ON|, throttling limits the
   // latter connection.
   MockWrite writes[] = {
-    MockWrite(true,
+    MockWrite(ASYNC,
               kHandshakeRequestWithoutCookie,
               kHandshakeRequestWithoutCookieLength,
               1),
-    MockWrite(true,
+    MockWrite(ASYNC,
               kDataHello,
               kDataHelloLength,
               3)
   };
   MockRead reads[] = {
-    MockRead(true,
+    MockRead(ASYNC,
              kHandshakeResponseWithoutCookie,
              kHandshakeResponseWithoutCookieLength,
              2),
-    MockRead(true,
+    MockRead(ASYNC,
              kDataWorld,
              kDataWorldLength,
              4),
-    MockRead(false, 0, 5)  // EOF
+    MockRead(SYNCHRONOUS, 0, 5)  // EOF
   };
   data_.reset(new OrderedSocketData(
       reads, arraysize(reads), writes, arraysize(writes)));
 
   GURL url("ws://example.com/demo");
   MockSocketStreamDelegate delegate;
   WebSocketJobTest* test = this;
   if (throttling == THROTTLING_ON)
     delegate.SetOnStartOpenConnection(
         base::Bind(&WebSocketJobTest::DoSync, base::Unretained(test)));
@@ skipping 34 matching lines @@
 }
 
 void WebSocketJobTest::TestConnectBySpdy(
     SpdyOption spdy, ThrottlingOption throttling) {
   // This is a test for verifying cooperation between WebSocketJob and
   // SocketStream in the situation we have SPDY session to the server. If
   // |throttling| was |THROTTLING_ON|, throttling limits the latter connection.
   // If you enabled spdy, you should specify |spdy| as |SPDY_ON|. Expected
   // results depend on its configuration.
   MockWrite writes_websocket[] = {
-    MockWrite(true,
+    MockWrite(ASYNC,
               kHandshakeRequestWithoutCookie,
               kHandshakeRequestWithoutCookieLength,
               1),
-    MockWrite(true,
+    MockWrite(ASYNC,
               kDataHello,
               kDataHelloLength,
               3)
   };
   MockRead reads_websocket[] = {
-    MockRead(true,
+    MockRead(ASYNC,
              kHandshakeResponseWithoutCookie,
              kHandshakeResponseWithoutCookieLength,
              2),
-    MockRead(true,
+    MockRead(ASYNC,
              kDataWorld,
              kDataWorldLength,
              4),
-    MockRead(false, 0, 5)  // EOF
+    MockRead(SYNCHRONOUS, 0, 5)  // EOF
   };
 
   const spdy::SpdyStreamId kStreamId = 1;
   scoped_ptr<spdy::SpdyFrame> request_frame(
       ConstructSpdyWebSocketHandshakeRequestFrame(
           kHandshakeRequestForSpdy,
           arraysize(kHandshakeRequestForSpdy) / 2,
           kStreamId,
           MEDIUM));
   scoped_ptr<spdy::SpdyFrame> response_frame(
@@ skipping 14 matching lines @@
           kDataWorldLength,
           kStreamId,
           false));
   MockWrite writes_spdy[] = {
     CreateMockWrite(*request_frame.get(), 1),
     CreateMockWrite(*data_hello_frame.get(), 3),
   };
   MockRead reads_spdy[] = {
     CreateMockRead(*response_frame.get(), 2),
     CreateMockRead(*data_world_frame.get(), 4),
-    MockRead(false, 0, 5)  // EOF
+    MockRead(SYNCHRONOUS, 0, 5)  // EOF
   };
 
   if (spdy == SPDY_ON)
     data_.reset(new OrderedSocketData(
         reads_spdy, arraysize(reads_spdy),
         writes_spdy, arraysize(writes_spdy)));
   else
     data_.reset(new OrderedSocketData(
         reads_websocket, arraysize(reads_websocket),
         writes_websocket, arraysize(writes_websocket)));
@@ skipping 138 matching lines @@
 
 TEST_F(WebSocketJobTest, ThrottlingSpdySpdyEnabled) {
   WebSocketJob::set_websocket_over_spdy_enabled(true);
   TestConnectBySpdy(SPDY_ON, THROTTLING_ON);
 }
 
 // TODO(toyoshim): Add tests to verify throttling, SPDY stream limitation.
 // TODO(toyoshim,yutak): Add tests to verify closing handshake.
 
 }  // namespace net