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

net/spdy/spdy_network_transaction_unittest.cc

Index: net/spdy/spdy_network_transaction_unittest.cc
===================================================================
--- net/spdy/spdy_network_transaction_unittest.cc	(revision 122608)
+++ net/spdy/spdy_network_transaction_unittest.cc	(working copy)
@@ -231,7 +231,7 @@
       DCHECK(!deterministic_);
       data_vector_.push_back(data);
       linked_ptr<SSLSocketDataProvider> ssl_(
-          new SSLSocketDataProvider(true, OK));
+          new SSLSocketDataProvider(ASYNC, OK));
       if (test_type_ == SPDYNPN) {
         ssl_->next_proto_status = SSLClientSocket::kNextProtoNegotiated;
         ssl_->next_proto = "spdy/2.1";
@@ -259,7 +259,7 @@
       DCHECK(deterministic_);
       data_vector_.push_back(data);
       linked_ptr<SSLSocketDataProvider> ssl_(
-          new SSLSocketDataProvider(true, OK));
+          new SSLSocketDataProvider(ASYNC, OK));
       if (test_type_ == SPDYNPN) {
         ssl_->next_proto_status = SSLClientSocket::kNextProtoNegotiated;
         ssl_->next_proto = "spdy/2.1";
@@ -557,7 +557,7 @@
   MockRead reads[] = {
     CreateMockRead(*resp),
     CreateMockRead(*body),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -607,7 +607,7 @@
     MockRead reads[] = {
       CreateMockRead(*resp),
       CreateMockRead(*body),
-      MockRead(true, 0, 0)  // EOF
+      MockRead(ASYNC, 0, 0)  // EOF
     };
 
     scoped_ptr<DelayedSocketData> data(
@@ -668,7 +668,7 @@
     CreateMockRead(*fbody2),
     CreateMockRead(*fbody3),
 
-    MockRead(true, 0, 0),  // EOF
+    MockRead(ASYNC, 0, 0),  // EOF
   };
   scoped_ptr<OrderedSocketData> data(
       new OrderedSocketData(reads, arraysize(reads),
@@ -752,7 +752,7 @@
     CreateMockRead(*body2),
     CreateMockRead(*fbody),
     CreateMockRead(*fbody2),
-    MockRead(true, 0, 0),  // EOF
+    MockRead(ASYNC, 0, 0),  // EOF
   };
   scoped_ptr<OrderedSocketData> data(
       new OrderedSocketData(reads, arraysize(reads),
@@ -839,7 +839,7 @@
     CreateMockRead(*body2),
     CreateMockRead(*fbody),
     CreateMockRead(*fbody2),
-    MockRead(true, 0, 0),  // EOF
+    MockRead(ASYNC, 0, 0),  // EOF
   };
   scoped_ptr<OrderedSocketData> preconnect_data(
       new OrderedSocketData(reads, arraysize(reads),
@@ -965,7 +965,7 @@
     CreateMockRead(*body3),
     CreateMockRead(*fbody3),
 
-    MockRead(true, 0, 0),  // EOF
+    MockRead(ASYNC, 0, 0),  // EOF
   };
 
   scoped_ptr<OrderedSocketData> data(
@@ -1105,7 +1105,7 @@
     CreateMockRead(*body3),
     CreateMockRead(*fbody3),
 
-    MockRead(true, 0, 0),  // EOF
+    MockRead(ASYNC, 0, 0),  // EOF
   };
 
   scoped_ptr<OrderedSocketData> data(
@@ -1242,7 +1242,7 @@
     CreateMockRead(*resp2, 7),
     CreateMockRead(*body2),
     CreateMockRead(*fbody2),
-    MockRead(true, 0, 0),  // EOF
+    MockRead(ASYNC, 0, 0),  // EOF
   };
 
   scoped_ptr<OrderedSocketData> data(
@@ -1372,7 +1372,7 @@
     CreateMockRead(*body),
     CreateMockRead(*fin_body),
     CreateMockRead(*resp2, 7),
-    MockRead(true, ERR_CONNECTION_RESET, 0),  // Abort!
+    MockRead(ASYNC, ERR_CONNECTION_RESET, 0),  // Abort!
   };
 
   scoped_ptr<OrderedSocketData> data(
@@ -1494,7 +1494,7 @@
   MockRead reads[] = {
     CreateMockRead(*resp),
     CreateMockRead(*body),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -1565,7 +1565,7 @@
   MockRead reads[] = {
     CreateMockRead(*resp),
     CreateMockRead(*body),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -1593,7 +1593,7 @@
   MockRead reads[] = {
     CreateMockRead(*resp),
     CreateMockRead(*body),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -1625,7 +1625,7 @@
     CreateMockRead(*resp),
     CreateMockRead(*chunk1),
     CreateMockRead(*chunk2),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -1663,7 +1663,7 @@
   MockRead reads[] = {
     CreateMockRead(*resp),
     CreateMockRead(*body),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -1710,7 +1710,7 @@
   MockRead reads[] = {
     CreateMockRead(*resp),
     CreateMockRead(*body),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -1749,7 +1749,7 @@
   MockRead reads[] = {
     CreateMockRead(*stream_reply, 2),
     CreateMockRead(*stream_body, 3),
-    MockRead(false, 0, 0)  // EOF
+    MockRead(SYNCHRONOUS, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -1773,15 +1773,15 @@
   scoped_ptr<spdy::SpdyFrame> rst(
       ConstructSpdyRstStream(1, spdy::CANCEL));
   MockWrite writes[] = {
-    CreateMockWrite(*req.get(), 0, false),
-    MockWrite(false, 0, 0, 2),
-    CreateMockWrite(*rst.get(), 3, false),
+    CreateMockWrite(*req.get(), 0, SYNCHRONOUS),
+    MockWrite(SYNCHRONOUS, 0, 0, 2),
+    CreateMockWrite(*rst.get(), 3, SYNCHRONOUS),
   };
 
   scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1));
   MockRead reads[] = {
-    CreateMockRead(*resp.get(), 1, true),
-    MockRead(true, 0, 0, 4)  // EOF
+    CreateMockRead(*resp.get(), 1, ASYNC),
+    MockRead(ASYNC, 0, 0, 4)  // EOF
   };
 
   scoped_refptr<DeterministicSocketData> data(
@@ -1813,7 +1813,7 @@
   scoped_ptr<spdy::SpdyFrame> body(ConstructSpdyBodyFrame(1, true));
   MockRead reads[] = {
     CreateMockRead(*body),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -1837,7 +1837,7 @@
     CreateMockRead(*resp),
     CreateMockRead(*resp),
     CreateMockRead(*body),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -1925,7 +1925,7 @@
     CreateMockRead(*window_update),
     CreateMockRead(*resp),
     CreateMockRead(*body_end),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -1988,10 +1988,10 @@
   MockRead reads[] = {
     CreateMockRead(*resp),
     CreateMockRead(*body_no_fin),
-    MockRead(true, ERR_IO_PENDING, 0),  // Force a pause
+    MockRead(ASYNC, ERR_IO_PENDING, 0),  // Force a pause
     CreateMockRead(*body_fin),
-    MockRead(true, ERR_IO_PENDING, 0),  // Force a pause
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, ERR_IO_PENDING, 0),  // Force a pause
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -2088,8 +2088,8 @@
     CreateMockRead(*window_update),
     CreateMockRead(*window_update),
     CreateMockRead(*window_update),
-    MockRead(true, ERR_IO_PENDING, 0),  // Wait for the RST to be written.
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, ERR_IO_PENDING, 0),  // Wait for the RST to be written.
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -2195,7 +2195,7 @@
     CreateMockRead(*reply),
     CreateMockRead(*body2),
     CreateMockRead(*body3),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   // Force all writes to happen before any read, last write will not
@@ -2257,7 +2257,7 @@
     // RunAllPending() call at the end since the SpdySession survives the
     // HttpNetworkTransaction and still tries to continue Read()'ing.  Any
     // MockRead will do here.
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   StaticSocketDataProvider data(reads, arraysize(reads),
@@ -2287,14 +2287,14 @@
   scoped_ptr<spdy::SpdyFrame> rst(
       ConstructSpdyRstStream(1, spdy::CANCEL));
   MockWrite writes[] = {
-    CreateMockWrite(*req, 0, false),
-    CreateMockWrite(*rst, 2, false),
+    CreateMockWrite(*req, 0, SYNCHRONOUS),
+    CreateMockWrite(*rst, 2, SYNCHRONOUS),
   };
 
   scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1));
   MockRead reads[] = {
-    CreateMockRead(*resp, 1, true),
-    MockRead(true, 0, 0, 3)  // EOF
+    CreateMockRead(*resp, 1, ASYNC),
+    MockRead(ASYNC, 0, 0, 3)  // EOF
   };
 
   scoped_refptr<DeterministicSocketData> data(
@@ -2344,15 +2344,15 @@
   scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1));
   MockRead reads[] = {
     CreateMockRead(*resp, 2),
-    MockRead(true, ERR_IO_PENDING, 3),  // Force a pause
-    MockRead(true, reinterpret_cast<const char*>(kGetBodyFrame2),
+    MockRead(ASYNC, ERR_IO_PENDING, 3),  // Force a pause
+    MockRead(ASYNC, reinterpret_cast<const char*>(kGetBodyFrame2),
              arraysize(kGetBodyFrame2), 4),
-    MockRead(true, ERR_IO_PENDING, 5),  // Force a pause
-    MockRead(true, 0, 0, 6),  // EOF
+    MockRead(ASYNC, ERR_IO_PENDING, 5),  // Force a pause
+    MockRead(ASYNC, 0, 0, 6),  // EOF
   };
   MockRead reads2[] = {
     CreateMockRead(*resp, 2),
-    MockRead(true, 0, 0, 3),  // EOF
+    MockRead(ASYNC, 0, 0, 3),  // EOF
   };
 
   scoped_ptr<OrderedSocketData> data(
@@ -2399,9 +2399,9 @@
   scoped_ptr<spdy::SpdyFrame> body(ConstructSpdyBodyFrame(1, true));
   MockRead reads[] = {
     CreateMockRead(*resp.get(), 2),
-    MockRead(true, ERR_IO_PENDING, 3),  // Force a pause
+    MockRead(ASYNC, ERR_IO_PENDING, 3),  // Force a pause
     CreateMockRead(*body.get(), 4),
-    MockRead(true, 0, 0, 5),  // EOF
+    MockRead(ASYNC, 0, 0, 5),  // EOF
   };
 
   scoped_ptr<OrderedSocketData> data(
@@ -2486,7 +2486,7 @@
   };
   MockRead reads[] = {
     CreateMockRead(*resp, 2),
-    MockRead(true, 0, 0, 3)  // EOF
+    MockRead(ASYNC, 0, 0, 3)  // EOF
   };
 
   // Setup writes/reads to www.foo.com
@@ -2498,7 +2498,7 @@
   MockRead reads2[] = {
     CreateMockRead(*resp2, 2),
     CreateMockRead(*body2, 3),
-    MockRead(true, 0, 0, 4)  // EOF
+    MockRead(ASYNC, 0, 0, 4)  // EOF
   };
   scoped_ptr<OrderedSocketData> data(
       new OrderedSocketData(reads, arraysize(reads),
@@ -2557,7 +2557,7 @@
       reply(ConstructSpdyGetSynReply(kExtraHeaders, 1, 1));
   MockRead reads[] = {
     CreateMockRead(*reply, 1),
-    MockRead(true, ERR_IO_PENDING, 3),  // Force a pause
+    MockRead(ASYNC, ERR_IO_PENDING, 3),  // Force a pause
   };
 
   HttpResponseInfo response;
@@ -2620,7 +2620,7 @@
     CreateMockRead(*stream1_reply),
     CreateMockRead(*stream1_headers),
     CreateMockRead(*stream1_body),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -2654,7 +2654,7 @@
     CreateMockRead(*reply, 1),
     CreateMockRead(*push, 1),
     CreateMockRead(*body, 1),
-    MockRead(true, ERR_IO_PENDING, 3),  // Force a pause
+    MockRead(ASYNC, ERR_IO_PENDING, 3),  // Force a pause
   };
 
   HttpResponseInfo response;
@@ -2721,8 +2721,8 @@
     CreateMockRead(*resp, 2),
     CreateMockRead(*rep, 3),
     CreateMockRead(*body, 4),
-    MockRead(true, ERR_IO_PENDING, 5),  // Force a pause
-    MockRead(true, 0, 0, 7)  // EOF
+    MockRead(ASYNC, ERR_IO_PENDING, 5),  // Force a pause
+    MockRead(ASYNC, 0, 0, 7)  // EOF
   };
 
   // Setup writes/reads to www.foo.com
@@ -2754,7 +2754,7 @@
   MockRead reads2[] = {
     CreateMockRead(*resp2, 2),
     CreateMockRead(*body2, 3),
-    MockRead(true, 0, 0, 5)  // EOF
+    MockRead(ASYNC, 0, 0, 5)  // EOF
   };
   scoped_ptr<OrderedSocketData> data(
       new OrderedSocketData(reads, arraysize(reads),
@@ -2834,10 +2834,10 @@
   MockRead reads[] = {
     CreateMockRead(*stream1_reply, 2),
     CreateMockRead(*stream2_syn, 3),
-    CreateMockRead(*stream1_body, 4, false),
-    MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame),
+    CreateMockRead(*stream1_body, 4, SYNCHRONOUS),
+    MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame),
              arraysize(kPushBodyFrame), 5),
-    MockRead(true, ERR_IO_PENDING, 6),  // Force a pause
+    MockRead(ASYNC, ERR_IO_PENDING, 6),  // Force a pause
   };
 
   HttpResponseInfo response;
@@ -2887,10 +2887,10 @@
   MockRead reads[] = {
     CreateMockRead(*stream1_reply, 2),
     CreateMockRead(*stream2_syn, 3),
-    MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame),
+    MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame),
              arraysize(kPushBodyFrame), 5),
-    CreateMockRead(*stream1_body, 4, false),
-    MockRead(true, ERR_IO_PENDING, 6),  // Force a pause
+    CreateMockRead(*stream1_body, 4, SYNCHRONOUS),
+    MockRead(ASYNC, ERR_IO_PENDING, 6),  // Force a pause
   };
 
   HttpResponseInfo response;
@@ -2938,8 +2938,8 @@
     CreateMockRead(*stream1_reply, 2),
     CreateMockRead(*stream2_syn, 3),
     CreateMockRead(*stream2_rst, 4),
-    CreateMockRead(*stream1_body, 5, false),
-    MockRead(true, ERR_IO_PENDING, 6),  // Force a pause
+    CreateMockRead(*stream1_body, 5, SYNCHRONOUS),
+    MockRead(ASYNC, ERR_IO_PENDING, 6),  // Force a pause
   };
 
   scoped_ptr<OrderedSocketData> data(
@@ -3015,10 +3015,10 @@
     CreateMockRead(*stream1_reply, 2),
     CreateMockRead(*stream2_syn, 3),
     CreateMockRead(*stream3_syn, 4),
-    CreateMockRead(*stream1_body, 6, false),
-    MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame),
+    CreateMockRead(*stream1_body, 6, SYNCHRONOUS),
+    MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame),
              arraysize(kPushBodyFrame), 7),
-    MockRead(true, ERR_IO_PENDING, 8),  // Force a pause
+    MockRead(ASYNC, ERR_IO_PENDING, 8),  // Force a pause
   };
 
   HttpResponseInfo response;
@@ -3072,16 +3072,16 @@
   MockRead reads[] = {
     CreateMockRead(*stream1_reply, 2),
     CreateMockRead(*stream2_syn, 3),
-    MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame1),
+    MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame1),
              arraysize(kPushBodyFrame1), 4),
-    MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame2),
+    MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame2),
              arraysize(kPushBodyFrame2) - 1, 5),
-    MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame3),
+    MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame3),
              arraysize(kPushBodyFrame3) - 1, 6),
-    MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame4),
+    MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame4),
              arraysize(kPushBodyFrame4) - 1, 7),
-    CreateMockRead(*stream1_body, 8, false),
-    MockRead(true, ERR_IO_PENDING, 9),  // Force a pause
+    CreateMockRead(*stream1_body, 8, SYNCHRONOUS),
+    MockRead(ASYNC, ERR_IO_PENDING, 9),  // Force a pause
   };
 
   HttpResponseInfo response;
@@ -3137,17 +3137,17 @@
   MockRead reads[] = {
     CreateMockRead(*stream1_reply, 2),
     CreateMockRead(*stream2_syn, 3),
-    MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame1),
+    MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame1),
              arraysize(kPushBodyFrame1), 4),
-    MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame2),
+    MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame2),
              arraysize(kPushBodyFrame2) - 1, 5),
-    MockRead(true, ERR_IO_PENDING, 6),  // Force a pause
-    MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame3),
+    MockRead(ASYNC, ERR_IO_PENDING, 6),  // Force a pause
+    MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame3),
              arraysize(kPushBodyFrame3) - 1, 7),
-    MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame4),
+    MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame4),
              arraysize(kPushBodyFrame4) - 1, 8),
-    CreateMockRead(*stream1_body.get(), 9, false),
-    MockRead(true, ERR_IO_PENDING, 10)  // Force a pause.
+    CreateMockRead(*stream1_body.get(), 9, SYNCHRONOUS),
+    MockRead(ASYNC, ERR_IO_PENDING, 10)  // Force a pause.
   };
 
   HttpResponseInfo response;
@@ -3198,7 +3198,7 @@
     CreateMockRead(*stream1_reply, 2),
     CreateMockRead(*stream2_syn, 3),
     CreateMockRead(*stream1_body, 4),
-    MockRead(true, ERR_IO_PENDING, 5)  // Force a pause
+    MockRead(ASYNC, ERR_IO_PENDING, 5)  // Force a pause
   };
 
   scoped_ptr<OrderedSocketData> data(
@@ -3260,7 +3260,7 @@
     CreateMockRead(*stream1_reply, 2),
     CreateMockRead(*stream2_syn, 3),
     CreateMockRead(*stream1_body, 4),
-    MockRead(true, ERR_IO_PENDING, 5),  // Force a pause
+    MockRead(ASYNC, ERR_IO_PENDING, 5),  // Force a pause
   };
 
   scoped_ptr<OrderedSocketData> data(
@@ -3318,7 +3318,7 @@
     CreateMockRead(*stream1_reply, 2),
     CreateMockRead(*stream2_syn, 3),
     CreateMockRead(*stream1_body, 4),
-    MockRead(true, ERR_IO_PENDING, 5)  // Force a pause
+    MockRead(ASYNC, ERR_IO_PENDING, 5)  // Force a pause
   };
 
   scoped_ptr<OrderedSocketData> data(
@@ -3407,7 +3407,7 @@
     MockRead reads[] = {
       CreateMockRead(*resp),
       CreateMockRead(*body),
-      MockRead(true, 0, 0)  // EOF
+      MockRead(ASYNC, 0, 0)  // EOF
     };
 
     scoped_ptr<DelayedSocketData> data(
@@ -3546,7 +3546,7 @@
     MockRead reads[] = {
       CreateMockRead(*frame_reply),
       CreateMockRead(*body),
-      MockRead(true, 0, 0)  // EOF
+      MockRead(ASYNC, 0, 0)  // EOF
     };
 
     // Attach the headers to the request.
@@ -3662,7 +3662,7 @@
     MockRead reads[] = {
       CreateMockRead(*resp),
       CreateMockRead(*body),
-      MockRead(true, 0, 0)  // EOF
+      MockRead(ASYNC, 0, 0)  // EOF
     };
 
     scoped_ptr<DelayedSocketData> data(
@@ -3694,14 +3694,14 @@
         ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
     MockWrite writes[] = {
       CreateMockWrite(*req),
-      MockWrite(true, 0, 0)  // EOF
+      MockWrite(ASYNC, 0, 0)  // EOF
     };
 
     scoped_ptr<spdy::SpdyFrame> body(ConstructSpdyBodyFrame(1, true));
     MockRead reads[] = {
       CreateMockRead(*test_cases[i].syn_reply),
       CreateMockRead(*body),
-      MockRead(true, 0, 0)  // EOF
+      MockRead(ASYNC, 0, 0)  // EOF
     };
 
     scoped_ptr<DelayedSocketData> data(
@@ -3720,9 +3720,9 @@
   scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
   MockWrite writes[] = {
     // We'll write 10 bytes successfully
-    MockWrite(true, req->data(), 10),
+    MockWrite(ASYNC, req->data(), 10),
     // Followed by ERROR!
-    MockWrite(true, ERR_FAILED),
+    MockWrite(ASYNC, ERR_FAILED),
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -3748,7 +3748,7 @@
   MockRead reads[] = {
     CreateMockRead(*resp),
     CreateMockRead(*body),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -3810,7 +3810,7 @@
   MockRead reads[] = {
     CreateMockRead(*resp),
     CreateMockRead(*body),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   net::CapturingBoundNetLog log(net::CapturingNetLog::kUnbounded);
@@ -3912,11 +3912,11 @@
   scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1));
   MockRead reads[] = {
     CreateMockRead(*resp),
-    MockRead(true, ERR_IO_PENDING),  // Force a pause
-    MockRead(true, combined_data_frames, combined_data_frames_len),
-    MockRead(true, ERR_IO_PENDING),  // Force a pause
+    MockRead(ASYNC, ERR_IO_PENDING),  // Force a pause
+    MockRead(ASYNC, combined_data_frames, combined_data_frames_len),
+    MockRead(ASYNC, ERR_IO_PENDING),  // Force a pause
     CreateMockRead(*last_frame),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -4011,9 +4011,9 @@
   scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1));
   MockRead reads[] = {
     CreateMockRead(*resp),
-    MockRead(true, ERR_IO_PENDING),  // Force a pause
-    MockRead(true, combined_data_frames, combined_data_frames_len),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, ERR_IO_PENDING),  // Force a pause
+    MockRead(ASYNC, combined_data_frames, combined_data_frames_len),
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -4110,8 +4110,8 @@
                     combined_frames, arraysize(combined_frames));
 
   MockRead reads[] = {
-    MockRead(true, combined_frames, combined_frames_len),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, combined_frames, combined_frames_len),
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -4198,9 +4198,9 @@
   scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1));
   MockRead reads[] = {
     CreateMockRead(*resp),
-    MockRead(true, ERR_IO_PENDING),  // Force a wait
-    MockRead(true, combined_data_frames, combined_data_frames_len),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, ERR_IO_PENDING),  // Force a wait
+    MockRead(ASYNC, combined_data_frames, combined_data_frames_len),
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -4279,9 +4279,9 @@
   scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1));
   MockRead reads[] = {
     CreateMockRead(*resp),
-    MockRead(true, ERR_IO_PENDING),  // Force a wait
+    MockRead(ASYNC, ERR_IO_PENDING),  // Force a wait
     CreateMockRead(*data_frame),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -4410,7 +4410,7 @@
     CreateMockRead(*reply),
     CreateMockRead(*body),
     CreateMockRead(*settings_frame),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -4528,7 +4528,7 @@
   MockRead reads[] = {
     CreateMockRead(*reply),
     CreateMockRead(*body),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -4572,7 +4572,7 @@
   scoped_ptr<spdy::SpdyFrame> go_away(ConstructSpdyGoAway());
   MockRead reads[] = {
     CreateMockRead(*go_away),
-    MockRead(true, 0, 0),  // EOF
+    MockRead(ASYNC, 0, 0),  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -4593,7 +4593,7 @@
   scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1));
   MockRead reads[] = {
     CreateMockRead(*resp),
-    MockRead(false, 0, 0)  // EOF
+    MockRead(SYNCHRONOUS, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -4647,25 +4647,25 @@
   scoped_ptr<spdy::SpdyFrame> body(ConstructSpdyBodyFrame(1, true));
 
   MockWrite writes_SPDYNPN[] = {
-    MockWrite(false, kConnect443, arraysize(kConnect443) - 1, 0),
+    MockWrite(SYNCHRONOUS, kConnect443, arraysize(kConnect443) - 1, 0),
     CreateMockWrite(*req, 2),
   };
   MockRead reads_SPDYNPN[] = {
-    MockRead(false, kHTTP200, arraysize(kHTTP200) - 1, 1),
+    MockRead(SYNCHRONOUS, kHTTP200, arraysize(kHTTP200) - 1, 1),
     CreateMockRead(*resp, 3),
     CreateMockRead(*body.get(), 4),
-    MockRead(true, 0, 0, 5),
+    MockRead(ASYNC, 0, 0, 5),
   };
 
   MockWrite writes_SPDYSSL[] = {
-    MockWrite(false, kConnect80, arraysize(kConnect80) - 1, 0),
+    MockWrite(SYNCHRONOUS, kConnect80, arraysize(kConnect80) - 1, 0),
     CreateMockWrite(*req, 2),
   };
   MockRead reads_SPDYSSL[] = {
-    MockRead(false, kHTTP200, arraysize(kHTTP200) - 1, 1),
+    MockRead(SYNCHRONOUS, kHTTP200, arraysize(kHTTP200) - 1, 1),
     CreateMockRead(*resp, 3),
     CreateMockRead(*body.get(), 4),
-    MockRead(true, 0, 0, 5),
+    MockRead(ASYNC, 0, 0, 5),
   };
 
   MockWrite writes_SPDYNOSSL[] = {
@@ -4675,7 +4675,7 @@
   MockRead reads_SPDYNOSSL[] = {
     CreateMockRead(*resp, 1),
     CreateMockRead(*body.get(), 2),
-    MockRead(true, 0, 0, 3),
+    MockRead(ASYNC, 0, 0, 3),
   };
 
   scoped_ptr<OrderedSocketData> data;
@@ -4755,8 +4755,8 @@
   MockRead reads[] = {
     CreateMockRead(*resp, 2),
     CreateMockRead(*body, 3),
-    MockRead(true, ERR_IO_PENDING, 4),  // Force a pause
-    MockRead(true, 0, 5)  // EOF
+    MockRead(ASYNC, ERR_IO_PENDING, 4),  // Force a pause
+    MockRead(ASYNC, 0, 5)  // EOF
   };
   scoped_ptr<OrderedSocketData> data(
       new OrderedSocketData(reads, arraysize(reads),
@@ -4806,14 +4806,14 @@
   scoped_ptr<spdy::SpdyFrame> body2(ConstructSpdyBodyFrame(1, true));
 
   MockWrite writes_SPDYNPN[] = {
-    MockWrite(false, kConnect443, arraysize(kConnect443) - 1, 0),
+    MockWrite(SYNCHRONOUS, kConnect443, arraysize(kConnect443) - 1, 0),
     CreateMockWrite(*req2, 2),
   };
   MockRead reads_SPDYNPN[] = {
-    MockRead(false, kHTTP200, arraysize(kHTTP200) - 1, 1),
+    MockRead(SYNCHRONOUS, kHTTP200, arraysize(kHTTP200) - 1, 1),
     CreateMockRead(*resp2, 3),
     CreateMockRead(*body2, 4),
-    MockRead(true, 0, 5)  // EOF
+    MockRead(ASYNC, 0, 5)  // EOF
   };
 
   MockWrite writes_SPDYNOSSL[] = {
@@ -4822,18 +4822,18 @@
   MockRead reads_SPDYNOSSL[] = {
     CreateMockRead(*resp2, 1),
     CreateMockRead(*body2, 2),
-    MockRead(true, 0, 3)  // EOF
+    MockRead(ASYNC, 0, 3)  // EOF
   };
 
   MockWrite writes_SPDYSSL[] = {
-    MockWrite(false, kConnect80, arraysize(kConnect80) - 1, 0),
+    MockWrite(SYNCHRONOUS, kConnect80, arraysize(kConnect80) - 1, 0),
     CreateMockWrite(*req2, 2),
   };
   MockRead reads_SPDYSSL[] = {
-    MockRead(false, kHTTP200, arraysize(kHTTP200) - 1, 1),
+    MockRead(SYNCHRONOUS, kHTTP200, arraysize(kHTTP200) - 1, 1),
     CreateMockRead(*resp2, 3),
     CreateMockRead(*body2, 4),
-    MockRead(true, 0, 0, 5),
+    MockRead(ASYNC, 0, 0, 5),
   };
 
   scoped_ptr<OrderedSocketData> data_proxy;
@@ -4910,14 +4910,14 @@
   MockRead reads[] = {
     CreateMockRead(*resp),
     CreateMockRead(*body),
-    MockRead(true, ERR_IO_PENDING),
-    MockRead(true, ERR_CONNECTION_RESET),
+    MockRead(ASYNC, ERR_IO_PENDING),
+    MockRead(ASYNC, ERR_CONNECTION_RESET),
   };
 
   MockRead reads2[] = {
     CreateMockRead(*resp),
     CreateMockRead(*body),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   // This test has a couple of variants.
@@ -4996,7 +4996,7 @@
   MockRead spdy_reads[] = {
     CreateMockRead(*resp),
     CreateMockRead(*body),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -5015,7 +5015,7 @@
   MockRead http_reads[] = {
     MockRead("HTTP/1.1 200 OK\r\n\r\n"),
     MockRead("hello from http"),
-    MockRead(false, OK),
+    MockRead(SYNCHRONOUS, OK),
   };
   scoped_ptr<DelayedSocketData> data2(
       new DelayedSocketData(1, http_reads, arraysize(http_reads),
@@ -5076,7 +5076,7 @@
     CreateMockRead(*body_authentication, 3),
     CreateMockRead(*resp_data, 5),
     CreateMockRead(*body_data, 6),
-    MockRead(true, 0, 7),
+    MockRead(ASYNC, 0, 7),
   };
 
   scoped_ptr<OrderedSocketData> data(
@@ -5179,10 +5179,10 @@
     CreateMockRead(*stream1_reply, 2),
     CreateMockRead(*stream2_syn, 3),
     CreateMockRead(*stream2_headers, 4),
-    CreateMockRead(*stream1_body, 5, false),
-    MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame),
+    CreateMockRead(*stream1_body, 5, SYNCHRONOUS),
+    MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame),
              arraysize(kPushBodyFrame), 6),
-    MockRead(true, ERR_IO_PENDING, 7),  // Force a pause
+    MockRead(ASYNC, ERR_IO_PENDING, 7),  // Force a pause
   };
 
   HttpResponseInfo response;
@@ -5219,7 +5219,7 @@
   scoped_ptr<spdy::SpdyFrame>
       stream1_body(ConstructSpdyBodyFrame(1, true));
   MockWrite writes[] = {
-    CreateMockWrite(*stream1_syn, 0, false),
+    CreateMockWrite(*stream1_syn, 0, SYNCHRONOUS),
   };
 
   static const char* const kInitialHeaders[] = {
@@ -5264,9 +5264,9 @@
     CreateMockRead(*stream2_syn, 2),
     CreateMockRead(*stream1_body, 3),
     CreateMockRead(*stream2_headers, 4),
-    MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame),
+    MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame),
              arraysize(kPushBodyFrame), 5),
-    MockRead(true, 0, 5),  // EOF
+    MockRead(ASYNC, 0, 5),  // EOF
   };
 
   HttpResponseInfo response;
@@ -5356,7 +5356,7 @@
   scoped_ptr<spdy::SpdyFrame>
       stream1_body(ConstructSpdyBodyFrame(1, true));
   MockWrite writes[] = {
-    CreateMockWrite(*stream1_syn, 0, false),
+    CreateMockWrite(*stream1_syn, 0, SYNCHRONOUS),
   };
 
   static const char* const kInitialHeaders[] = {
@@ -5415,9 +5415,9 @@
     CreateMockRead(*stream1_body, 3),
     CreateMockRead(*stream2_headers1, 4),
     CreateMockRead(*stream2_headers2, 5),
-    MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame),
+    MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame),
              arraysize(kPushBodyFrame), 6),
-    MockRead(true, 0, 6),  // EOF
+    MockRead(ASYNC, 0, 6),  // EOF
   };
 
   HttpResponseInfo response;
@@ -5544,7 +5544,7 @@
     CreateMockRead(*stream1_reply),
     CreateMockRead(*stream1_headers),
     CreateMockRead(*stream1_body),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -5602,7 +5602,7 @@
     CreateMockRead(*stream1_body),
     CreateMockRead(*stream1_headers),
     CreateMockRead(*stream1_body2),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -5660,7 +5660,7 @@
     CreateMockRead(*stream1_body),
     CreateMockRead(*stream1_headers),
     CreateMockRead(*stream1_body2),
-    MockRead(true, 0, 0)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
 
   scoped_ptr<DelayedSocketData> data(
@@ -5734,10 +5734,10 @@
     MockRead reads[] = {
       CreateMockRead(*stream1_reply, 2),
       CreateMockRead(*stream2_syn, 3),
-      CreateMockRead(*stream1_body, 5, false),
-      MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame),
+      CreateMockRead(*stream1_body, 5, SYNCHRONOUS),
+      MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame),
                arraysize(kPushBodyFrame), 6),
-      MockRead(true, ERR_IO_PENDING, 7),  // Force a pause
+      MockRead(ASYNC, ERR_IO_PENDING, 7),  // Force a pause
     };
 
     HttpResponseInfo response;
@@ -5802,7 +5802,7 @@
     CreateMockRead(*refused, 2),
     CreateMockRead(*resp, 4),
     CreateMockRead(*body, 5),
-    MockRead(true, 0, 6)  // EOF
+    MockRead(ASYNC, 0, 6)  // EOF
   };
 
   scoped_ptr<OrderedSocketData> data(