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

net/spdy/spdy_test_util.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/spdy/spdy_test_util.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 11 matching lines @@
 // |data| is the frame to chop.
 // |length| is the length of the frame to chop.
 // |num_chunks| is the number of chunks to create.
 MockWrite* ChopWriteFrame(const char* data, int length, int num_chunks) {
   MockWrite* chunks = new MockWrite[num_chunks];
   int chunk_size = length / num_chunks;
   for (int index = 0; index < num_chunks; index++) {
     const char* ptr = data + (index * chunk_size);
     if (index == num_chunks - 1)
       chunk_size += length % chunk_size;  // The last chunk takes the remainder.
-    chunks[index] = MockWrite(true, ptr, chunk_size);
+    chunks[index] = MockWrite(ASYNC, ptr, chunk_size);
   }
   return chunks;
 }
 
 // Chop a SpdyFrame into an array of MockWrites.
 // |frame| is the frame to chop.
 // |num_chunks| is the number of chunks to create.
 MockWrite* ChopWriteFrame(const spdy::SpdyFrame& frame, int num_chunks) {
   return ChopWriteFrame(frame.data(),
                         frame.length() + spdy::SpdyFrame::kHeaderSize,
                         num_chunks);
 }
 
 // Chop a frame into an array of MockReads.
 // |data| is the frame to chop.
 // |length| is the length of the frame to chop.
 // |num_chunks| is the number of chunks to create.
 MockRead* ChopReadFrame(const char* data, int length, int num_chunks) {
   MockRead* chunks = new MockRead[num_chunks];
   int chunk_size = length / num_chunks;
   for (int index = 0; index < num_chunks; index++) {
     const char* ptr = data + (index * chunk_size);
     if (index == num_chunks - 1)
       chunk_size += length % chunk_size;  // The last chunk takes the remainder.
-    chunks[index] = MockRead(true, ptr, chunk_size);
+    chunks[index] = MockRead(ASYNC, ptr, chunk_size);
   }
   return chunks;
 }
 
 // Chop a SpdyFrame into an array of MockReads.
 // |frame| is the frame to chop.
 // |num_chunks| is the number of chunks to create.
 MockRead* ChopReadFrame(const spdy::SpdyFrame& frame, int num_chunks) {
   return ChopReadFrame(frame.data(),
                        frame.length() + spdy::SpdyFrame::kHeaderSize,
@@ skipping 776 matching lines @@
                                   strlen("\n"),
                                   &buffer_write,
                                   &buffer_left);
   }
   return packet_size;
 }
 
 // Create a MockWrite from the given SpdyFrame.
 MockWrite CreateMockWrite(const spdy::SpdyFrame& req) {
   return MockWrite(
-      true, req.data(), req.length() + spdy::SpdyFrame::kHeaderSize);
+      ASYNC, req.data(), req.length() + spdy::SpdyFrame::kHeaderSize);
 }
 
 // Create a MockWrite from the given SpdyFrame and sequence number.
 MockWrite CreateMockWrite(const spdy::SpdyFrame& req, int seq) {
-  return CreateMockWrite(req, seq, true);
+  return CreateMockWrite(req, seq, ASYNC);
 }
 
 // Create a MockWrite from the given SpdyFrame and sequence number.
-MockWrite CreateMockWrite(const spdy::SpdyFrame& req, int seq, bool async) {
+MockWrite CreateMockWrite(const spdy::SpdyFrame& req, int seq, IoMode mode) {
   return MockWrite(
-      async, req.data(), req.length() + spdy::SpdyFrame::kHeaderSize, seq);
+      mode, req.data(), req.length() + spdy::SpdyFrame::kHeaderSize, seq);
 }
 
 // Create a MockRead from the given SpdyFrame.
 MockRead CreateMockRead(const spdy::SpdyFrame& resp) {
   return MockRead(
-      true, resp.data(), resp.length() + spdy::SpdyFrame::kHeaderSize);
+      ASYNC, resp.data(), resp.length() + spdy::SpdyFrame::kHeaderSize);
 }
 
 // Create a MockRead from the given SpdyFrame and sequence number.
 MockRead CreateMockRead(const spdy::SpdyFrame& resp, int seq) {
-  return CreateMockRead(resp, seq, true);
+  return CreateMockRead(resp, seq, ASYNC);
 }
 
 // Create a MockRead from the given SpdyFrame and sequence number.
-MockRead CreateMockRead(const spdy::SpdyFrame& resp, int seq, bool async) {
+MockRead CreateMockRead(const spdy::SpdyFrame& resp, int seq, IoMode mode) {
   return MockRead(
-      async, resp.data(), resp.length() + spdy::SpdyFrame::kHeaderSize, seq);
+      mode, resp.data(), resp.length() + spdy::SpdyFrame::kHeaderSize, seq);
 }
 
 // Combines the given SpdyFrames into the given char array and returns
 // the total length.
 int CombineFrames(const spdy::SpdyFrame** frames, int num_frames,
                   char* buff, int buff_len) {
   int total_len = 0;
   for (int i = 0; i < num_frames; ++i) {
     total_len += frames[i]->length() + spdy::SpdyFrame::kHeaderSize;
   }
@@ skipping 105 matching lines @@
     spdy::CONTROL_FLAG_FIN,       // Control Flags
     false,                        // Compressed
     spdy::INVALID,                // Status
     NULL,                         // Data
     0,                            // Length
     spdy::DATA_FLAG_NONE          // Data Flags
   };
   return kHeader;
 }
 }  // namespace net