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

net/socket_stream/socket_stream_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/socket_stream/socket_stream.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 270 matching lines @@
   MockHostResolver host_resolver;
 
   scoped_refptr<SocketStream> socket_stream(
       new SocketStream(GURL("ws://example.com/demo"), delegate.get()));
 
   socket_stream->set_context(new TestURLRequestContext());
   socket_stream->SetHostResolver(&host_resolver);
 
   MockWrite data_writes[] = {
     MockWrite(SocketStreamTest::kWebSocketHandshakeRequest),
-    MockWrite(true, "\0message1\xff", 10),
-    MockWrite(true, "\0message2\xff", 10)
+    MockWrite(ASYNC, "\0message1\xff", 10),
+    MockWrite(ASYNC, "\0message2\xff", 10)
   };
   MockRead data_reads[] = {
     MockRead(SocketStreamTest::kWebSocketHandshakeResponse),
     // Server doesn't close the connection after handshake.
-    MockRead(true, ERR_IO_PENDING)
+    MockRead(ASYNC, ERR_IO_PENDING)
   };
   AddWebSocketMessage("message1");
   AddWebSocketMessage("message2");
 
   scoped_ptr<DelayedSocketData> data_provider(
       new DelayedSocketData(1,
                             data_reads, arraysize(data_reads),
                             data_writes, arraysize(data_writes)));
 
   MockClientSocketFactory* mock_socket_factory =
@@ skipping 43 matching lines @@
               "Proxy-Connection: keep-alive\r\n"
               "Proxy-Authorization: Basic Zm9vOmJhcg==\r\n\r\n"),
   };
   MockRead data_reads2[] = {
     MockRead("HTTP/1.1 200 Connection Established\r\n"),
     MockRead("Proxy-agent: Apache/2.2.8\r\n"),
     MockRead("\r\n"),
     // SocketStream::DoClose is run asynchronously.  Socket can be read after
     // "\r\n".  We have to give ERR_IO_PENDING to SocketStream then to indicate
     // server doesn't close the connection.
-    MockRead(true, ERR_IO_PENDING)
+    MockRead(ASYNC, ERR_IO_PENDING)
   };
   StaticSocketDataProvider data2(data_reads2, arraysize(data_reads2),
                                  data_writes2, arraysize(data_writes2));
   mock_socket_factory.AddSocketDataProvider(&data2);
 
   TestCompletionCallback test_callback;
 
   scoped_ptr<SocketStreamEventRecorder> delegate(
       new SocketStreamEventRecorder(test_callback.callback()));
   delegate->SetOnConnected(base::Bind(&SocketStreamEventRecorder::DoClose,
@@ skipping 46 matching lines @@
   MockHostResolver host_resolver;
 
   scoped_refptr<SocketStream> socket_stream(
       new SocketStream(GURL("ws://example.com/demo"), delegate.get()));
 
   socket_stream->set_context(new TestURLRequestContext());
   socket_stream->SetHostResolver(&host_resolver);
 
   MockWrite data_writes[] = {
     MockWrite(SocketStreamTest::kWebSocketHandshakeRequest),
-    MockWrite(true, "\0message1\xff", 10),
-    MockWrite(true, "\0message2\xff", 10)
+    MockWrite(ASYNC, "\0message1\xff", 10),
+    MockWrite(ASYNC, "\0message2\xff", 10)
   };
   MockRead data_reads[] = {
     MockRead(SocketStreamTest::kWebSocketHandshakeResponse),
     // Server doesn't close the connection after handshake.
-    MockRead(true, ERR_IO_PENDING)
+    MockRead(ASYNC, ERR_IO_PENDING)
   };
   AddWebSocketMessage("message1");
   AddWebSocketMessage("message2");
 
   scoped_ptr<DelayedSocketData> data_provider(
       new DelayedSocketData(1,
                             data_reads, arraysize(data_reads),
                             data_writes, arraysize(data_writes)));
 
   MockClientSocketFactory* mock_socket_factory =
@@ skipping 95 matching lines @@
               "Host: example.com\r\n"
               "Proxy-Connection: keep-alive\r\n\r\n")
   };
   MockRead data_reads[] = {
     MockRead("HTTP/1.1 200 Connection Established\r\n"),
     MockRead("Proxy-agent: Apache/2.2.8\r\n"),
     MockRead("\r\n"),
     // SocketStream::DoClose is run asynchronously.  Socket can be read after
     // "\r\n".  We have to give ERR_IO_PENDING to SocketStream then to indicate
     // server doesn't close the connection.
-    MockRead(true, ERR_IO_PENDING)
+    MockRead(ASYNC, ERR_IO_PENDING)
   };
   StaticSocketDataProvider data(data_reads, arraysize(data_reads),
                                 data_writes, arraysize(data_writes));
   mock_socket_factory.AddSocketDataProvider(&data);
-  SSLSocketDataProvider ssl(false, ERR_SSL_PROTOCOL_ERROR);
+  SSLSocketDataProvider ssl(SYNCHRONOUS, ERR_SSL_PROTOCOL_ERROR);
   mock_socket_factory.AddSSLSocketDataProvider(&ssl);
 
   TestCompletionCallback test_callback;
 
   scoped_ptr<SocketStreamEventRecorder> delegate(
       new SocketStreamEventRecorder(test_callback.callback()));
   delegate->SetOnConnected(base::Bind(&SocketStreamEventRecorder::DoClose,
                                       base::Unretained(delegate.get())));
 
   scoped_refptr<SocketStream> socket_stream(
@@ skipping 26 matching lines @@
               "Host: example.com\r\n"
               "Proxy-Connection: keep-alive\r\n\r\n")
   };
   MockRead data_reads[] = {
     MockRead("HTTP/1.1 200 Connection Established\r\n"),
     MockRead("Proxy-agent: Apache/2.2.8\r\n"),
     MockRead("\r\n"),
     // SocketStream::DoClose is run asynchronously.  Socket can be read after
     // "\r\n".  We have to give ERR_IO_PENDING to SocketStream then to indicate
     // server doesn't close the connection.
-    MockRead(true, ERR_IO_PENDING)
+    MockRead(ASYNC, ERR_IO_PENDING)
   };
   StaticSocketDataProvider data(data_reads, arraysize(data_reads),
                                 data_writes, arraysize(data_writes));
   mock_socket_factory.AddSocketDataProvider(&data);
-  SSLSocketDataProvider ssl(false, OK);
+  SSLSocketDataProvider ssl(SYNCHRONOUS, OK);
   mock_socket_factory.AddSSLSocketDataProvider(&ssl);
 
   TestCompletionCallback test_callback;
 
   scoped_ptr<SocketStreamEventRecorder> delegate(
       new SocketStreamEventRecorder(test_callback.callback()));
   delegate->SetOnConnected(base::Bind(&SocketStreamEventRecorder::DoClose,
                                       base::Unretained(delegate.get())));
 
   scoped_refptr<SocketStream> socket_stream(
@@ skipping 13 matching lines @@
 
   EXPECT_EQ(SocketStreamEvent::EVENT_START_OPEN_CONNECTION,
             events[0].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_CONNECTED, events[1].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_ERROR, events[2].event_type);
   EXPECT_EQ(net::ERR_ABORTED, events[2].error_code);
   EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[3].event_type);
 }
 
 }  // namespace net