Revert 33073 - Reland 33018:

Fix the FlipSession to support partial writes.

Modified the FlipIOBuffer to use a DrainableIOBuffer instead
of a IOBufferWithSize.  When a write completes, we drain the
bytes, and only fetch the next FlipFrame from the queue after
we have fully drained the buffer.

I will update the tests to be much more thorough in my next
CL.

BUG=none
TEST=FlipNetworkTransactionTest.PartialWrites

Review URL: http://codereview.chromium.org/436019


Review URL: http://codereview.chromium.org/434065

TBR=mbelshe@google.com
Review URL: http://codereview.chromium.org/443003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33076 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 342 insertions, 313 deletions

diff --git a/net/flip/flip_io_buffer.cc b/net/flip/flip_io_buffer.cc
index 87d8d21..5235c62 100644
--- a/net/flip/flip_io_buffer.cc
+++ b/net/flip/flip_io_buffer.cc
@@ -11,8 +11,8 @@ namespace net {
 uint64 FlipIOBuffer::order_ = 0;
 
 FlipIOBuffer::FlipIOBuffer(
-    IOBuffer* buffer, int size, int priority, FlipStream* stream)
-  : buffer_(new DrainableIOBuffer(buffer, size)),
+    IOBufferWithSize* buffer, int priority, FlipStream* stream)
+  : buffer_(buffer),
     priority_(priority),
     position_(++order_),
     stream_(stream) {}
diff --git a/net/flip/flip_io_buffer.h b/net/flip/flip_io_buffer.h
index c16c39c..ffb4b3b 100644
--- a/net/flip/flip_io_buffer.h
+++ b/net/flip/flip_io_buffer.h
@@ -20,16 +20,15 @@ class FlipIOBuffer {
  public:
   // Constructor
   // |buffer| is the actual data buffer.
-  // |size| is the size of the data buffer.
   // |priority| is the priority of this buffer.  Lower numbers are higher
   //            priority.
   // |stream| is a pointer to the stream which is managing this buffer.
-  FlipIOBuffer(IOBuffer* buffer, int size, int priority, FlipStream* stream);
+  FlipIOBuffer(IOBufferWithSize* buffer, int priority, FlipStream* stream);
   FlipIOBuffer();
   ~FlipIOBuffer();
 
   // Accessors.
-  DrainableIOBuffer* buffer() const { return buffer_; }
+  IOBuffer* buffer() const { return buffer_; }
   size_t size() const { return buffer_->size(); }
   void release();
   int priority() const { return priority_; }
@@ -43,7 +42,7 @@ class FlipIOBuffer {
   }
 
  private:
-  scoped_refptr<DrainableIOBuffer> buffer_;
+  scoped_refptr<IOBufferWithSize> buffer_;
   int priority_;
   uint64 position_;
   scoped_refptr<FlipStream> stream_;
diff --git a/net/flip/flip_network_transaction_unittest.cc b/net/flip/flip_network_transaction_unittest.cc
index 7cf3fb9..74f9e64 100644
--- a/net/flip/flip_network_transaction_unittest.cc
+++ b/net/flip/flip_network_transaction_unittest.cc
@@ -69,105 +69,6 @@ HttpNetworkSession* CreateSession(SessionDependencies* session_deps) {
                                 session_deps->flip_session_pool);
 }
 
-// Chop a frame into an array of MockWrites.
-// |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* ChopFrame(const char* data, int length, int num_chunks) {
-  MockWrite* chunks = new MockWrite[num_chunks + 1];
-  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[num_chunks] = MockWrite(true, 0, 0);
-  return chunks;
-}
-
-// ----------------------------------------------------------------------------
-
-static const unsigned char kGetSyn[] = {
-  0x80, 0x01, 0x00, 0x01,                                        // header
-  0x01, 0x00, 0x00, 0x45,                                        // FIN, len
-  0x00, 0x00, 0x00, 0x01,                                        // stream id
-  0xc0, 0x00, 0x00, 0x03,                                        // 4 headers
-  0x00, 0x06, 'm', 'e', 't', 'h', 'o', 'd',
-  0x00, 0x03, 'G', 'E', 'T',
-  0x00, 0x03, 'u', 'r', 'l',
-  0x00, 0x16, 'h', 't', 't', 'p', ':', '/', '/', 'w', 'w', 'w',
-              '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'c', 'o',
-              'm', '/',
-  0x00, 0x07, 'v', 'e', 'r', 's', 'i', 'o', 'n',
-  0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',
-};
-
-static const unsigned char kGetSynReply[] = {
-  0x80, 0x01, 0x00, 0x02,                                        // header
-  0x00, 0x00, 0x00, 0x45,
-  0x00, 0x00, 0x00, 0x01,
-  0x00, 0x00, 0x00, 0x04,                                        // 4 headers
-  0x00, 0x05, 'h', 'e', 'l', 'l', 'o',                           // "hello"
-  0x00, 0x03, 'b', 'y', 'e',                                     // "bye"
-  0x00, 0x06, 's', 't', 'a', 't', 'u', 's',                      // "status"
-  0x00, 0x03, '2', '0', '0',                                     // "200"
-  0x00, 0x03, 'u', 'r', 'l',                                     // "url"
-  0x00, 0x0a, '/', 'i', 'n', 'd', 'e', 'x', '.', 'p', 'h', 'p',  // "/index...
-  0x00, 0x07, 'v', 'e', 'r', 's', 'i', 'o', 'n',                 // "version"
-  0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',            // "HTTP/1.1"
-};
-
-static const unsigned char kGetBodyFrame[] = {
-  0x00, 0x00, 0x00, 0x01,                                        // header
-  0x01, 0x00, 0x00, 0x06,                                        // FIN, length
-  'h', 'e', 'l', 'l', 'o', '!',                                  // "hello"
-};
-
-static const unsigned char kPostSyn[] = {
-  0x80, 0x01, 0x00, 0x01,                                      // header
-  0x00, 0x00, 0x00, 0x46,                                      // flags, len
-  0x00, 0x00, 0x00, 0x01,                                      // stream id
-  0xc0, 0x00, 0x00, 0x03,                                      // 4 headers
-  0x00, 0x06, 'm', 'e', 't', 'h', 'o', 'd',
-  0x00, 0x04, 'P', 'O', 'S', 'T',
-  0x00, 0x03, 'u', 'r', 'l',
-  0x00, 0x16, 'h', 't', 't', 'p', ':', '/', '/', 'w', 'w', 'w',
-              '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'c', 'o',
-              'm', '/',
-  0x00, 0x07, 'v', 'e', 'r', 's', 'i', 'o', 'n',
-  0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',
-};
-
-static const unsigned char kPostUploadFrame[] = {
-  0x00, 0x00, 0x00, 0x01,                                        // header
-  0x01, 0x00, 0x00, 0x0c,                                        // FIN flag
-  'h', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd', '\0'
-};
-
-// The response
-static const unsigned char kPostSynReply[] = {
-  0x80, 0x01, 0x00, 0x02,                                        // header
-  0x00, 0x00, 0x00, 0x45,
-  0x00, 0x00, 0x00, 0x01,
-  0x00, 0x00, 0x00, 0x04,                                        // 4 headers
-  0x00, 0x05, 'h', 'e', 'l', 'l', 'o',                           // "hello"
-  0x00, 0x03, 'b', 'y', 'e',                                     // "bye"
-  0x00, 0x06, 's', 't', 'a', 't', 'u', 's',                      // "status"
-  0x00, 0x03, '2', '0', '0',                                     // "200"
-  0x00, 0x03, 'u', 'r', 'l',                                     // "url"
-  // "/index.php"
-  0x00, 0x0a, '/', 'i', 'n', 'd', 'e', 'x', '.', 'p', 'h', 'p',
-  0x00, 0x07, 'v', 'e', 'r', 's', 'i', 'o', 'n',                 // "version"
-  0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',            // "HTTP/1.1"
-};
-
-static const unsigned char kPostBodyFrame[] = {
-  0x00, 0x00, 0x00, 0x01,                                        // header
-  0x01, 0x00, 0x00, 0x06,                                        // FIN, length
-  'h', 'e', 'l', 'l', 'o', '!',                                  // "hello"
-};
-
 }  // namespace
 
 // A DataProvider where the client must write a request before the reads (e.g.
@@ -175,21 +76,15 @@ static const unsigned char kPostBodyFrame[] = {
 class DelayedSocketData : public StaticSocketDataProvider,
                           public base::RefCounted<DelayedSocketData> {
  public:
-  // |reads| the list of MockRead completions.
-  // |write_delay| the number of MockWrites to complete before allowing
-  //               a MockRead to complete.
-  // |writes| the list of MockWrite completions.
   // Note: All MockReads and MockWrites must be async.
   // Note: The MockRead and MockWrite lists musts end with a EOF
   //       e.g. a MockRead(true, 0, 0);
-  DelayedSocketData(MockRead* reads, int write_delay, MockWrite* writes)
-    : StaticSocketDataProvider(reads, writes),
-      write_delay_(write_delay) {
-    DCHECK_GE(write_delay_, 0);
-  }
+  DelayedSocketData(MockRead* r, MockWrite* w)
+    : StaticSocketDataProvider(r, w),
+      request_received_(false) {}
 
   virtual MockRead GetNextRead() {
-    if (write_delay_)
+    if (!request_received_)
       return MockRead(true, ERR_IO_PENDING);
     return StaticSocketDataProvider::GetNextRead();
   }
@@ -197,9 +92,11 @@ class DelayedSocketData : public StaticSocketDataProvider,
   virtual MockWriteResult OnWrite(const std::string& data) {
     MockWriteResult rv = StaticSocketDataProvider::OnWrite(data);
     // Now that our write has completed, we can allow reads to continue.
-    if (!--write_delay_)
+    if (!request_received_) {
+      request_received_ = true;
       MessageLoop::current()->PostDelayedTask(FROM_HERE,
         NewRunnableMethod(this, &DelayedSocketData::CompleteRead), 100);
+    }
     return rv;
   }
 
@@ -208,7 +105,7 @@ class DelayedSocketData : public StaticSocketDataProvider,
   }
 
  private:
-  int write_delay_;
+  bool request_received_;
 };
 
 class FlipNetworkTransactionTest : public PlatformTest {
@@ -234,7 +131,8 @@ class FlipNetworkTransactionTest : public PlatformTest {
   };
 
   TransactionHelperResult TransactionHelper(const HttpRequestInfo& request,
-                                            DelayedSocketData* data) {
+                                            MockRead reads[],
+                                            MockWrite writes[]) {
     TransactionHelperResult out;
 
     // We disable SSL for this test.
@@ -244,7 +142,8 @@ class FlipNetworkTransactionTest : public PlatformTest {
     scoped_ptr<FlipNetworkTransaction> trans(
         new FlipNetworkTransaction(CreateSession(&session_deps)));
 
-    session_deps.socket_factory.AddSocketDataProvider(data);
+    scoped_refptr<DelayedSocketData> data(new DelayedSocketData(reads, writes));
+    session_deps.socket_factory.AddSocketDataProvider(data.get());
 
     TestCompletionCallback callback;
 
@@ -287,17 +186,58 @@ TEST_F(FlipNetworkTransactionTest, Constructor) {
 }
 
 TEST_F(FlipNetworkTransactionTest, Get) {
+  static const unsigned char syn[] = {
+    0x80, 0x01, 0x00, 0x01,                                        // header
+    0x01, 0x00, 0x00, 0x45,                                        // FIN, len
+    0x00, 0x00, 0x00, 0x01,                                        // stream id
+    0xc0, 0x00, 0x00, 0x03,                                        // 4 headers
+    0x00, 0x06, 'm', 'e', 't', 'h', 'o', 'd',
+    0x00, 0x03, 'G', 'E', 'T',
+    0x00, 0x03, 'u', 'r', 'l',
+    0x00, 0x16, 'h', 't', 't', 'p', ':', '/', '/', 'w', 'w', 'w',
+                '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'c', 'o',
+                'm', '/',
+    0x00, 0x07, 'v', 'e', 'r', 's', 'i', 'o', 'n',
+    0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',
+  };
+
+  static const unsigned char syn_reply[] = {
+    0x80, 0x01, 0x00, 0x02,                                        // header
+    0x00, 0x00, 0x00, 0x45,
+    0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x04,                                        // 4 headers
+    0x00, 0x05, 'h', 'e', 'l', 'l', 'o',                           // "hello"
+    0x00, 0x03, 'b', 'y', 'e',                                     // "bye"
+    0x00, 0x06, 's', 't', 'a', 't', 'u', 's',                      // "status"
+    0x00, 0x03, '2', '0', '0',                                     // "200"
+    0x00, 0x03, 'u', 'r', 'l',                                     // "url"
+    0x00, 0x0a, '/', 'i', 'n', 'd', 'e', 'x', '.', 'p', 'h', 'p',  // "HTTP/1.1"
+    0x00, 0x07, 'v', 'e', 'r', 's', 'i', 'o', 'n',                 // "version"
+    0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',            // "HTTP/1.1"
+  };
+  static const unsigned char body_frame[] = {
+    0x00, 0x00, 0x00, 0x01,                                        // header
+    0x00, 0x00, 0x00, 0x06,
+    'h', 'e', 'l', 'l', 'o', '!',                                  // "hello"
+  };
+  static const unsigned char fin_frame[] = {
+    0x80, 0x01, 0x00, 0x03,                                        // header
+    0x00, 0x00, 0x00, 0x08,
+    0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00,
+  };
+
   MockWrite writes[] = {
-    MockWrite(true, reinterpret_cast<const char*>(kGetSyn),
-              arraysize(kGetSyn)),
+    MockWrite(true, reinterpret_cast<const char*>(syn), sizeof(syn)),
     MockWrite(true, 0, 0)  // EOF
   };
 
   MockRead reads[] = {
-    MockRead(true, reinterpret_cast<const char*>(kGetSynReply),
-             arraysize(kGetSynReply)),
-    MockRead(true, reinterpret_cast<const char*>(kGetBodyFrame),
-             arraysize(kGetBodyFrame)),
+    MockRead(true, reinterpret_cast<const char*>(syn_reply), sizeof(syn_reply)),
+    MockRead(true, reinterpret_cast<const char*>(body_frame),
+             sizeof(body_frame)),
+    MockRead(true, reinterpret_cast<const char*>(fin_frame),
+             sizeof(fin_frame)),
     MockRead(true, 0, 0)  // EOF
   };
 
@@ -305,9 +245,7 @@ TEST_F(FlipNetworkTransactionTest, Get) {
   request.method = "GET";
   request.url = GURL("http://www.google.com/");
   request.load_flags = 0;
-  scoped_refptr<DelayedSocketData> data(
-      new DelayedSocketData(reads, 1, writes));
-  TransactionHelperResult out = TransactionHelper(request, data.get());
+  TransactionHelperResult out = TransactionHelper(request, reads, writes);
   EXPECT_EQ(OK, out.rv);
   EXPECT_EQ("HTTP/1.1 200 OK", out.status_line);
   EXPECT_EQ("hello!", out.response_data);
@@ -324,25 +262,75 @@ TEST_F(FlipNetworkTransactionTest, Post) {
   request.upload_data = new UploadData();
   request.upload_data->AppendBytes(upload, sizeof(upload));
 
+  // TODO(mbelshe): Hook up the write validation.
+
+  static const unsigned char syn[] = {
+    0x80, 0x01, 0x00, 0x01,                                      // header
+    0x00, 0x00, 0x00, 0x46,                                      // flags, len
+    0x00, 0x00, 0x00, 0x01,                                      // stream id
+    0xc0, 0x00, 0x00, 0x03,                                      // 4 headers
+    0x00, 0x06, 'm', 'e', 't', 'h', 'o', 'd',
+    0x00, 0x04, 'P', 'O', 'S', 'T',
+    0x00, 0x03, 'u', 'r', 'l',
+    0x00, 0x16, 'h', 't', 't', 'p', ':', '/', '/', 'w', 'w', 'w',
+                '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'c', 'o',
+                'm', '/',
+    0x00, 0x07, 'v', 'e', 'r', 's', 'i', 'o', 'n',
+    0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',
+  };
+
+  static const unsigned char upload_frame[] = {
+    0x00, 0x00, 0x00, 0x01,                                        // header
+    0x01, 0x00, 0x00, 0x0c,                                        // FIN flag
+    'h', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd', '\0'
+  };
+
+  // The response
+  static const unsigned char syn_reply[] = {
+    0x80, 0x01, 0x00, 0x02,                                        // header
+    0x00, 0x00, 0x00, 0x45,
+    0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x04,                                        // 4 headers
+    0x00, 0x05, 'h', 'e', 'l', 'l', 'o',                           // "hello"
+    0x00, 0x03, 'b', 'y', 'e',                                     // "bye"
+    0x00, 0x06, 's', 't', 'a', 't', 'u', 's',                      // "status"
+    0x00, 0x03, '2', '0', '0',                                     // "200"
+    0x00, 0x03, 'u', 'r', 'l',                                     // "url"
+    // "/index.php"
+    0x00, 0x0a, '/', 'i', 'n', 'd', 'e', 'x', '.', 'p', 'h', 'p',
+    0x00, 0x07, 'v', 'e', 'r', 's', 'i', 'o', 'n',                 // "version"
+    0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',            // "HTTP/1.1"
+  };
+  static const unsigned char body_frame[] = {
+    0x00, 0x00, 0x00, 0x01,                                        // header
+    0x00, 0x00, 0x00, 0x06,
+    'h', 'e', 'l', 'l', 'o', '!',                                  // "hello"
+  };
+  static const unsigned char fin_frame[] = {
+    0x80, 0x01, 0x00, 0x03,                                        // header
+    0x00, 0x00, 0x00, 0x08,
+    0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00,
+  };
+
   MockWrite writes[] = {
-    MockWrite(true, reinterpret_cast<const char*>(kPostSyn),
-              arraysize(kPostSyn)),
-    MockWrite(true, reinterpret_cast<const char*>(kPostUploadFrame),
-              arraysize(kPostUploadFrame)),
+    MockWrite(true, reinterpret_cast<const char*>(syn), sizeof(syn)),
+    MockWrite(true, reinterpret_cast<const char*>(upload_frame),
+              sizeof(upload_frame)),
     MockWrite(true, 0, 0)  // EOF
   };
 
   MockRead reads[] = {
-    MockRead(true, reinterpret_cast<const char*>(kPostSynReply),
-             arraysize(kPostSynReply)),
-    MockRead(true, reinterpret_cast<const char*>(kPostBodyFrame),
-             arraysize(kPostBodyFrame)),
+    MockRead(true, reinterpret_cast<const char*>(syn_reply),
+             sizeof(syn_reply)),
+    MockRead(true, reinterpret_cast<const char*>(body_frame),
+             sizeof(body_frame)),
+    MockRead(true, reinterpret_cast<const char*>(fin_frame),
+             sizeof(fin_frame)),
     MockRead(true, 0, 0)  // EOF
   };
 
-  scoped_refptr<DelayedSocketData> data(
-      new DelayedSocketData(reads, 2, writes));
-  TransactionHelperResult out = TransactionHelper(request, data.get());
+  TransactionHelperResult out = TransactionHelper(request, reads, writes);
   EXPECT_EQ(OK, out.rv);
   EXPECT_EQ("HTTP/1.1 200 OK", out.status_line);
   EXPECT_EQ("hello!", out.response_data);
@@ -350,21 +338,6 @@ TEST_F(FlipNetworkTransactionTest, Post) {
 
 // Test that a simple POST works.
 TEST_F(FlipNetworkTransactionTest, EmptyPost) {
-static const unsigned char kEmptyPostSyn[] = {
-  0x80, 0x01, 0x00, 0x01,                                      // header
-  0x01, 0x00, 0x00, 0x46,                                      // flags, len
-  0x00, 0x00, 0x00, 0x01,                                      // stream id
-  0xc0, 0x00, 0x00, 0x03,                                      // 4 headers
-  0x00, 0x06, 'm', 'e', 't', 'h', 'o', 'd',
-  0x00, 0x04, 'P', 'O', 'S', 'T',
-  0x00, 0x03, 'u', 'r', 'l',
-  0x00, 0x16, 'h', 't', 't', 'p', ':', '/', '/', 'w', 'w', 'w',
-              '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'c', 'o',
-              'm', '/',
-  0x00, 0x07, 'v', 'e', 'r', 's', 'i', 'o', 'n',
-  0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',
-};
-
   // Setup the request
   HttpRequestInfo request;
   request.method = "POST";
@@ -372,24 +345,67 @@ static const unsigned char kEmptyPostSyn[] = {
   // Create an empty UploadData.
   request.upload_data = new UploadData();
 
+  // TODO(mbelshe): Hook up the write validation.
+
+  static const unsigned char syn[] = {
+    0x80, 0x01, 0x00, 0x01,                                      // header
+    0x01, 0x00, 0x00, 0x46,                                      // FIN, len
+    0x00, 0x00, 0x00, 0x01,                                      // stream id
+    0xc0, 0x00, 0x00, 0x03,                                      // 4 headers
+    0x00, 0x06, 'm', 'e', 't', 'h', 'o', 'd',
+    0x00, 0x04, 'P', 'O', 'S', 'T',
+    0x00, 0x03, 'u', 'r', 'l',
+    0x00, 0x16, 'h', 't', 't', 'p', ':', '/', '/', 'w', 'w', 'w',
+                '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'c', 'o',
+                'm', '/',
+    0x00, 0x07, 'v', 'e', 'r', 's', 'i', 'o', 'n',
+    0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',
+  };
+
+  // The response
+  static const unsigned char syn_reply[] = {
+    0x80, 0x01, 0x00, 0x02,                                        // header
+    0x00, 0x00, 0x00, 0x45,
+    0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x04,                                        // 4 headers
+    0x00, 0x05, 'h', 'e', 'l', 'l', 'o',                           // "hello"
+    0x00, 0x03, 'b', 'y', 'e',                                     // "bye"
+    0x00, 0x06, 's', 't', 'a', 't', 'u', 's',                      // "status"
+    0x00, 0x03, '2', '0', '0',                                     // "200"
+    0x00, 0x03, 'u', 'r', 'l',                                     // "url"
+    // "/index.php"
+    0x00, 0x0a, '/', 'i', 'n', 'd', 'e', 'x', '.', 'p', 'h', 'p',
+    0x00, 0x07, 'v', 'e', 'r', 's', 'i', 'o', 'n',                 // "version"
+    0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',            // "HTTP/1.1"
+  };
+  static const unsigned char body_frame[] = {
+    0x00, 0x00, 0x00, 0x01,                                        // header
+    0x00, 0x00, 0x00, 0x06,
+    'h', 'e', 'l', 'l', 'o', '!',                                  // "hello"
+  };
+  static const unsigned char fin_frame[] = {
+    0x80, 0x01, 0x00, 0x03,                                        // header
+    0x00, 0x00, 0x00, 0x08,
+    0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00,
+  };
+
   MockWrite writes[] = {
-    MockWrite(true, reinterpret_cast<const char*>(kEmptyPostSyn),
-              arraysize(kEmptyPostSyn)),
+    MockWrite(true, reinterpret_cast<const char*>(syn), sizeof(syn)),
     MockWrite(true, 0, 0)  // EOF
   };
 
   MockRead reads[] = {
-    MockRead(true, reinterpret_cast<const char*>(kPostSynReply),
-             arraysize(kPostSynReply)),
-    MockRead(true, reinterpret_cast<const char*>(kPostBodyFrame),
-             arraysize(kGetBodyFrame)),
+    MockRead(true, reinterpret_cast<const char*>(syn_reply),
+             sizeof(syn_reply)),
+    MockRead(true, reinterpret_cast<const char*>(body_frame),
+             sizeof(body_frame)),
+    MockRead(true, reinterpret_cast<const char*>(fin_frame),
+             sizeof(fin_frame)),
     MockRead(true, 0, 0)  // EOF
   };
 
-  scoped_refptr<DelayedSocketData> data(
-    new DelayedSocketData(reads, 1, writes));
-
-  TransactionHelperResult out = TransactionHelper(request, data);
+  TransactionHelperResult out = TransactionHelper(request, reads, writes);
   EXPECT_EQ(OK, out.rv);
   EXPECT_EQ("HTTP/1.1 200 OK", out.status_line);
   EXPECT_EQ("hello!", out.response_data);
@@ -397,9 +413,22 @@ static const unsigned char kEmptyPostSyn[] = {
 
 // Test that the transaction doesn't crash when we don't have a reply.
 TEST_F(FlipNetworkTransactionTest, ResponseWithoutSynReply) {
+  static const unsigned char body_frame[] = {
+    0x00, 0x00, 0x00, 0x01,                                        // header
+    0x00, 0x00, 0x00, 0x06,
+    'h', 'e', 'l', 'l', 'o', '!',                                  // "hello"
+  };
+  static const unsigned char fin_frame[] = {
+    0x80, 0x01, 0x00, 0x03,                                        // header
+    0x00, 0x00, 0x00, 0x08,
+    0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00,
+  };
+
   MockRead reads[] = {
-    MockRead(true, reinterpret_cast<const char*>(kPostBodyFrame),
-             arraysize(kPostBodyFrame)),
+    MockRead(true, reinterpret_cast<const char*>(body_frame),
+             sizeof(body_frame)),
+    MockRead(true, reinterpret_cast<const char*>(fin_frame), sizeof(fin_frame)),
     MockRead(true, 0, 0)  // EOF
   };
 
@@ -407,9 +436,7 @@ TEST_F(FlipNetworkTransactionTest, ResponseWithoutSynReply) {
   request.method = "GET";
   request.url = GURL("http://www.google.com/");
   request.load_flags = 0;
-  scoped_refptr<DelayedSocketData> data(
-      new DelayedSocketData(reads, 1, NULL));
-  TransactionHelperResult out = TransactionHelper(request, data.get());
+  TransactionHelperResult out = TransactionHelper(request, reads, NULL);
   EXPECT_EQ(ERR_SYN_REPLY_NOT_RECEIVED, out.rv);
 }
 
@@ -417,15 +444,43 @@ TEST_F(FlipNetworkTransactionTest, ResponseWithoutSynReply) {
 // goes away.  They're calling into the ClientSocketFactory which doesn't exist
 // anymore, so it crashes.
 TEST_F(FlipNetworkTransactionTest, DISABLED_CancelledTransaction) {
+  static const unsigned char syn[] = {
+    0x80, 0x01, 0x00, 0x01,                                        // header
+    0x01, 0x00, 0x00, 0x45,                                        // FIN, len
+    0x00, 0x00, 0x00, 0x01,                                        // stream id
+    0xc0, 0x00, 0x00, 0x03,                                        // 4 headers
+    0x00, 0x06, 'm', 'e', 't', 'h', 'o', 'd',
+    0x00, 0x03, 'G', 'E', 'T',
+    0x00, 0x03, 'u', 'r', 'l',
+    0x00, 0x16, 'h', 't', 't', 'p', ':', '/', '/', 'w', 'w', 'w',
+                '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'c', 'o',
+                'm', '/',
+    0x00, 0x07, 'v', 'e', 'r', 's', 'i', 'o', 'n',
+    0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',
+  };
+
+  static const unsigned char syn_reply[] = {
+    0x80, 0x01, 0x00, 0x02,                                        // header
+    0x00, 0x00, 0x00, 0x45,
+    0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x04,                                        // 4 headers
+    0x00, 0x05, 'h', 'e', 'l', 'l', 'o',                           // "hello"
+    0x00, 0x03, 'b', 'y', 'e',                                     // "bye"
+    0x00, 0x06, 's', 't', 'a', 't', 'u', 's',                      // "status"
+    0x00, 0x03, '2', '0', '0',                                     // "200"
+    0x00, 0x03, 'u', 'r', 'l',                                     // "url"
+    0x00, 0x0a, '/', 'i', 'n', 'd', 'e', 'x', '.', 'p', 'h', 'p',  // "HTTP/1.1"
+    0x00, 0x07, 'v', 'e', 'r', 's', 'i', 'o', 'n',                 // "version"
+    0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',            // "HTTP/1.1"
+  };
+
   MockWrite writes[] = {
-    MockWrite(true, reinterpret_cast<const char*>(kGetSyn),
-              arraysize(kGetSyn)),
+    MockWrite(true, reinterpret_cast<const char*>(syn), sizeof(syn)),
     MockRead(true, 0, 0)  // EOF
   };
 
   MockRead reads[] = {
-    MockRead(true, reinterpret_cast<const char*>(kGetSynReply),
-             arraysize(kGetSynReply)),
+    MockRead(true, reinterpret_cast<const char*>(syn_reply), sizeof(syn_reply)),
     // This following read isn't used by the test, except during the
     // RunAllPending() call at the end since the FlipSession survives the
     // FlipNetworkTransaction and still tries to continue Read()'ing.  Any
@@ -462,6 +517,21 @@ TEST_F(FlipNetworkTransactionTest, DISABLED_CancelledTransaction) {
 // Verify that various SynReply headers parse correctly through the
 // HTTP layer.
 TEST_F(FlipNetworkTransactionTest, SynReplyHeaders) {
+  static const unsigned char syn[] = {
+    0x80, 0x01, 0x00, 0x01,                                        // header
+    0x01, 0x00, 0x00, 0x45,                                        // FIN, len
+    0x00, 0x00, 0x00, 0x01,                                        // stream id
+    0xc0, 0x00, 0x00, 0x03,                                        // 4 headers
+    0x00, 0x06, 'm', 'e', 't', 'h', 'o', 'd',
+    0x00, 0x03, 'G', 'E', 'T',
+    0x00, 0x03, 'u', 'r', 'l',
+    0x00, 0x16, 'h', 't', 't', 'p', ':', '/', '/', 'w', 'w', 'w',
+                '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'c', 'o',
+                'm', '/',
+    0x00, 0x07, 'v', 'e', 'r', 's', 'i', 'o', 'n',
+    0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',
+  };
+
   // This uses a multi-valued cookie header.
   static const unsigned char syn_reply1[] = {
     0x80, 0x01, 0x00, 0x02,
@@ -509,6 +579,18 @@ TEST_F(FlipNetworkTransactionTest, SynReplyHeaders) {
     0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',
   };
 
+  static const unsigned char body_frame[] = {
+    0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x06,
+    'h', 'e', 'l', 'l', 'o', '!',
+  };
+  static const unsigned char fin_frame[] = {
+    0x80, 0x01, 0x00, 0x03,
+    0x00, 0x00, 0x00, 0x08,
+    0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00,
+  };
+
   struct SynReplyTests {
     const unsigned char* syn_reply;
     int syn_reply_length;
@@ -541,16 +623,17 @@ TEST_F(FlipNetworkTransactionTest, SynReplyHeaders) {
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
     MockWrite writes[] = {
-      MockWrite(true, reinterpret_cast<const char*>(kGetSyn),
-                arraysize(kGetSyn)),
+      MockWrite(true, reinterpret_cast<const char*>(syn), sizeof(syn)),
       MockWrite(true, 0, 0)  // EOF
     };
 
     MockRead reads[] = {
       MockRead(true, reinterpret_cast<const char*>(test_cases[i].syn_reply),
                test_cases[i].syn_reply_length),
-      MockRead(true, reinterpret_cast<const char*>(kGetBodyFrame),
-               arraysize(kGetBodyFrame)),
+      MockRead(true, reinterpret_cast<const char*>(body_frame),
+               sizeof(body_frame)),
+      MockRead(true, reinterpret_cast<const char*>(fin_frame),
+               sizeof(fin_frame)),
       MockRead(true, 0, 0)  // EOF
     };
 
@@ -558,9 +641,7 @@ TEST_F(FlipNetworkTransactionTest, SynReplyHeaders) {
     request.method = "GET";
     request.url = GURL("http://www.google.com/");
     request.load_flags = 0;
-    scoped_refptr<DelayedSocketData> data(
-        new DelayedSocketData(reads, 1, writes));
-    TransactionHelperResult out = TransactionHelper(request, data.get());
+    TransactionHelperResult out = TransactionHelper(request, reads, writes);
     EXPECT_EQ(OK, out.rv);
     EXPECT_EQ("HTTP/1.1 200 OK", out.status_line);
     EXPECT_EQ("hello!", out.response_data);
@@ -581,6 +662,22 @@ TEST_F(FlipNetworkTransactionTest, SynReplyHeaders) {
 
 // TODO(mbelshe):  This test is broken right now and we need to fix it!
 TEST_F(FlipNetworkTransactionTest, DISABLED_ServerPush) {
+  // Basic request
+  static const unsigned char syn[] = {
+    0x80, 0x01, 0x00, 0x01,
+    0x01, 0x00, 0x00, 0x45,
+    0x00, 0x00, 0x00, 0x01,
+    0xc0, 0x00, 0x00, 0x03,
+    0x00, 0x06, 'm', 'e', 't', 'h', 'o', 'd',
+    0x00, 0x03, 'G', 'E', 'T',
+    0x00, 0x03, 'u', 'r', 'l',
+    0x00, 0x16, 'h', 't', 't', 'p', ':', '/', '/', 'w', 'w', 'w',
+                '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'c', 'o',
+                'm', '/',
+    0x00, 0x07, 'v', 'e', 'r', 's', 'i', 'o', 'n',
+    0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',
+  };
+
   // Reply with the X-Associated-Content header.
   static const unsigned char syn_reply[] = {
     0x80, 0x01, 0x00, 0x02,
@@ -600,6 +697,13 @@ TEST_F(FlipNetworkTransactionTest, DISABLED_ServerPush) {
     0x00, 0x08, 'H', 'T', 'T', 'P', '/', '1', '.', '1',
   };
 
+  // Body for stream 1
+  static const unsigned char body_frame[] = {
+    0x00, 0x00, 0x00, 0x01,
+    0x01, 0x00, 0x00, 0x06,
+    'h', 'e', 'l', 'l', 'o', '!',
+  };
+
   // Syn for the X-Associated-Content (foo.dat)
   static const unsigned char syn_push[] = {
     0x80, 0x01, 0x00, 0x01,
@@ -624,16 +728,14 @@ TEST_F(FlipNetworkTransactionTest, DISABLED_ServerPush) {
   };
 
   MockWrite writes[] = {
-    MockWrite(true, reinterpret_cast<const char*>(kGetSyn),
-              arraysize(kGetSyn)),
+    MockWrite(true, reinterpret_cast<const char*>(syn), sizeof(syn)),
     MockWrite(true, 0, 0)  // EOF
   };
 
   MockRead reads[] = {
-    MockRead(true, reinterpret_cast<const char*>(syn_reply),
-             arraysize(syn_reply)),
-    MockRead(true, reinterpret_cast<const char*>(kGetBodyFrame),
-             arraysize(kGetBodyFrame)),
+    MockRead(true, reinterpret_cast<const char*>(syn_reply), arraysize(syn_reply)),
+    MockRead(true, reinterpret_cast<const char*>(body_frame),
+             arraysize(body_frame)),
     MockRead(true, ERR_IO_PENDING),  // Force a pause
     MockRead(true, reinterpret_cast<const char*>(syn_push),
              arraysize(syn_push)),
@@ -663,7 +765,7 @@ TEST_F(FlipNetworkTransactionTest, DISABLED_ServerPush) {
     SessionDependencies session_deps;
     scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
     scoped_refptr<DelayedSocketData> data(
-        new DelayedSocketData(reads, 1, writes));
+        new DelayedSocketData(reads, writes));
     session_deps.socket_factory.AddSocketDataProvider(data.get());
 
     // Issue the first request
@@ -737,59 +839,4 @@ TEST_F(FlipNetworkTransactionTest, DISABLED_ServerPush) {
   }
 }
 
-// Test that we shutdown correctly on write errors.
-TEST_F(FlipNetworkTransactionTest, WriteError) {
-  MockWrite writes[] = {
-    // We'll write 10 bytes successfully
-    MockWrite(true, reinterpret_cast<const char*>(kGetSyn), 10),
-    // Followed by ERROR!
-    MockWrite(true, ERR_FAILED),
-    MockWrite(true, 0, 0)  // EOF
-  };
-
-  MockRead reads[] = {
-    MockRead(true, reinterpret_cast<const char*>(kGetSynReply),
-             arraysize(kGetSynReply)),
-    MockRead(true, reinterpret_cast<const char*>(kGetBodyFrame),
-             arraysize(kGetBodyFrame)),
-    MockRead(true, 0, 0)  // EOF
-  };
-
-  HttpRequestInfo request;
-  request.method = "GET";
-  request.url = GURL("http://www.google.com/");
-  request.load_flags = 0;
-  scoped_refptr<DelayedSocketData> data(
-      new DelayedSocketData(reads, 2, writes));
-  TransactionHelperResult out = TransactionHelper(request, data.get());
-  EXPECT_EQ(ERR_FAILED, out.rv);
-}
-
-// Test that partial writes work.
-TEST_F(FlipNetworkTransactionTest, PartialWrite) {
-  // Chop the SYN_STREAM frame into 5 chunks.
-  const int kChunks = 5;
-  scoped_array<MockWrite> writes(ChopFrame(
-      reinterpret_cast<const char*>(kGetSyn), arraysize(kGetSyn), kChunks));
-
-  MockRead reads[] = {
-    MockRead(true, reinterpret_cast<const char*>(kGetSynReply),
-             arraysize(kGetSynReply)),
-    MockRead(true, reinterpret_cast<const char*>(kGetBodyFrame),
-             arraysize(kGetBodyFrame)),
-    MockRead(true, 0, 0)  // EOF
-  };
-
-  HttpRequestInfo request;
-  request.method = "GET";
-  request.url = GURL("http://www.google.com/");
-  request.load_flags = 0;
-  scoped_refptr<DelayedSocketData> data(
-      new DelayedSocketData(reads, kChunks, writes.get()));
-  TransactionHelperResult out = TransactionHelper(request, data.get());
-  EXPECT_EQ(OK, out.rv);
-  EXPECT_EQ("HTTP/1.1 200 OK", out.status_line);
-  EXPECT_EQ("hello!", out.response_data);
-}
-
 }  // namespace net
diff --git a/net/flip/flip_session.cc b/net/flip/flip_session.cc
index 8b62c50..de87732 100644
--- a/net/flip/flip_session.cc
+++ b/net/flip/flip_session.cc
@@ -267,9 +267,9 @@ scoped_refptr<FlipStream> FlipSession::GetOrCreateStream(
       flip_framer_.CreateSynStream(stream_id, priority, flags, false,
                                    &headers));
   int length = flip::FlipFrame::size() + syn_frame->length();
-  IOBuffer* buffer = new IOBuffer(length);
+  IOBufferWithSize* buffer = new IOBufferWithSize(length);
   memcpy(buffer->data(), syn_frame->data(), length);
-  queue_.push(FlipIOBuffer(buffer, length, priority, stream));
+  queue_.push(FlipIOBuffer(buffer, priority, stream));
 
   static StatsCounter flip_requests("flip.requests");
   flip_requests.Increment();
@@ -324,7 +324,7 @@ int FlipSession::WriteStreamData(flip::FlipStreamId stream_id,
   int length = flip::FlipFrame::size() + frame->length();
   IOBufferWithSize* buffer = new IOBufferWithSize(length);
   memcpy(buffer->data(), frame->data(), length);
-  queue_.push(FlipIOBuffer(buffer, length, stream->priority(), stream));
+  queue_.push(FlipIOBuffer(buffer, stream->priority(), stream));
 
   // Whenever we queue onto the socket we need to ensure that we will write to
   // it later.
@@ -449,52 +449,40 @@ void FlipSession::OnReadComplete(int bytes_read) {
 
 void FlipSession::OnWriteComplete(int result) {
   DCHECK(write_pending_);
-  DCHECK(in_flight_write_.size());
-  DCHECK(result != 0);  // This shouldn't happen for write.
-
   write_pending_ = false;
 
   LOG(INFO) << "Flip write complete (result=" << result << ")";
 
   if (result >= 0) {
-    // It should not be possible to have written more bytes than our
-    // in_flight_write_.
-    DCHECK_LE(result, in_flight_write_.buffer()->BytesRemaining());
-
-    in_flight_write_.buffer()->DidConsume(result);
-
-    // We only notify the stream when we've fully written the pending frame.
-    if (!in_flight_write_.buffer()->BytesRemaining()) {
-      scoped_refptr<FlipStream> stream = in_flight_write_.stream();
-      DCHECK(stream.get());
-
-      // Report the number of bytes written to the caller, but exclude the
-      // frame size overhead.  NOTE:  if this frame was compressed the reported
-      // bytes written is the compressed size, not the original size.
-      if (result > 0) {
-        result = in_flight_write_.buffer()->size();
-        DCHECK_GT(result, static_cast<int>(flip::FlipFrame::size()));
-        result -= static_cast<int>(flip::FlipFrame::size());
-      }
-      stream->OnWriteComplete(result);
-
-      // Cleanup the write which just completed.
-      in_flight_write_.release();
+    // TODO(mbelshe) Verify that we wrote ALL the bytes of the frame.
+    //               The code current is broken in the case of a partial write.
+    DCHECK_EQ(static_cast<size_t>(result), in_flight_write_.size());
+
+    // We only notify the stream when we've fully written the pending flip
+    // frame.
+    scoped_refptr<FlipStream> stream = in_flight_write_.stream();
+    DCHECK(stream.get());
+
+    // Report the number of bytes written to the caller, but exclude the
+    // frame size overhead.
+    if (result > 0) {
+      // TODO(willchan): This is an unsafe DCHECK.  I'm hitting this.  We should
+      // handle small writes appropriately.
+      DCHECK(result > static_cast<int>(flip::FlipFrame::size()));
+      result -= static_cast<int>(flip::FlipFrame::size());
     }
+    stream->OnWriteComplete(result);
+
+    // Cleanup the write which just completed.
+    in_flight_write_.release();
 
     // Write more data.  We're already in a continuation, so we can
     // go ahead and write it immediately (without going back to the
     // message loop).
     WriteSocketLater();
   } else {
-    // The stream is now errored.  Close it down.
-    CloseAllStreams(static_cast<net::Error>(result));
-    // TODO(mbelshe): we need to cleanup the session here as well.
-    //   Right now, but a read and a write can fail, and each will
-    //   remove the session from the pool, which trips asserts. We
-    //   need to cleanup the close logic so that we only call it
-    //   once.
-    //session_->flip_session_pool()->Remove(this);
+    // TODO(mbelshe): Deal with result < 0 error case.
+    NOTIMPLEMENTED();
   }
 }
 
@@ -547,40 +535,36 @@ void FlipSession::WriteSocket() {
 
   // Loop sending frames until we've sent everything or until the write
   // returns error (or ERR_IO_PENDING).
-  while (in_flight_write_.buffer() || queue_.size()) {
-    if (!in_flight_write_.buffer()) {
-      // Grab the next FlipFrame to send.
-      FlipIOBuffer next_buffer = queue_.top();
-      queue_.pop();
-
-      // We've deferred compression until just before we write it to the socket,
-      // which is now.  At this time, we don't compress our data frames.
-      flip::FlipFrame uncompressed_frame(next_buffer.buffer()->data(), false);
-      size_t size;
-      if (uncompressed_frame.is_control_frame()) {
-        scoped_ptr<flip::FlipFrame> compressed_frame(
-            flip_framer_.CompressFrame(&uncompressed_frame));
-        size = compressed_frame->length() + flip::FlipFrame::size();
-
-        DCHECK(size > 0);
-
-        // TODO(mbelshe): We have too much copying of data here.
-        IOBufferWithSize* buffer = new IOBufferWithSize(size);
-        memcpy(buffer->data(), compressed_frame->data(), size);
-
-        // Attempt to send the frame.
-        in_flight_write_ = FlipIOBuffer(buffer, size, 0, next_buffer.stream());
-      } else {
-        size = uncompressed_frame.length() + flip::FlipFrame::size();
-        in_flight_write_ = next_buffer;
-      }
+  while (queue_.size()) {
+    // Grab the next FlipFrame to send.
+    FlipIOBuffer next_buffer = queue_.top();
+    queue_.pop();
+
+    // We've deferred compression until just before we write it to the socket,
+    // which is now.  At this time, we don't compress our data frames.
+    flip::FlipFrame uncompressed_frame(next_buffer.buffer()->data(), false);
+    size_t size;
+    if (uncompressed_frame.is_control_frame()) {
+      scoped_ptr<flip::FlipFrame> compressed_frame(
+          flip_framer_.CompressFrame(&uncompressed_frame));
+      size = compressed_frame->length() + flip::FlipFrame::size();
+
+      DCHECK(size > 0);
+
+      // TODO(mbelshe): We have too much copying of data here.
+      IOBufferWithSize* buffer = new IOBufferWithSize(size);
+      memcpy(buffer->data(), compressed_frame->data(), size);
+
+      // Attempt to send the frame.
+      in_flight_write_ = FlipIOBuffer(buffer, 0, next_buffer.stream());
     } else {
-      DCHECK(in_flight_write_.buffer()->BytesRemaining());
+      size = uncompressed_frame.length() + flip::FlipFrame::size();
+      in_flight_write_ = next_buffer;
     }
 
     write_pending_ = true;
     int rv = connection_.socket()->Write(in_flight_write_.buffer(),
-        in_flight_write_.buffer()->BytesRemaining(), &write_callback_);
+                                         size, &write_callback_);
     if (rv == net::ERR_IO_PENDING)
       break;
 
@@ -615,7 +599,7 @@ void FlipSession::CloseAllStreams(net::Error code) {
     for (--index; index >= 0; index--) {
       LOG(ERROR) << "ABANDONED (stream_id=" << list[index]->stream_id()
                  << "): " << list[index]->path();
-      list[index]->OnClose(code);
+      list[index]->OnClose(ERR_ABORTED);
     }
 
     // Clear out anything pending.
diff --git a/net/flip/flip_session_unittest.cc b/net/flip/flip_session_unittest.cc
index ca048ea..20604fe 100644
--- a/net/flip/flip_session_unittest.cc
+++ b/net/flip/flip_session_unittest.cc
@@ -2,9 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/flip/flip_io_buffer.h"
-
 #include "net/base/test_completion_callback.h"
+#include "net/flip/flip_io_buffer.h"
 #include "net/flip/flip_session.h"
 #include "net/flip/flip_stream.h"
 #include "net/socket/socket_test_util.h"
@@ -23,7 +22,7 @@ TEST_F(FlipSessionTest, FlipIOBuffer) {
 
   // Insert 100 items; pri 100 to 1.
   for (size_t index = 0; index < kQueueSize; ++index) {
-    FlipIOBuffer buffer(new IOBuffer(), 0, kQueueSize - index, NULL);
+    FlipIOBuffer buffer(NULL, kQueueSize - index, NULL);
     queue_.push(buffer);
   }
 
@@ -32,7 +31,7 @@ TEST_F(FlipSessionTest, FlipIOBuffer) {
   IOBufferWithSize* buffers[kNumDuplicates];
   for (size_t index = 0; index < kNumDuplicates; ++index) {
     buffers[index] = new IOBufferWithSize(index+1);
-    queue_.push(FlipIOBuffer(buffers[index], buffers[index]->size(), 0, NULL));
+    queue_.push(FlipIOBuffer(buffers[index], 0, NULL));
   }
 
   EXPECT_EQ(kQueueSize + kNumDuplicates, queue_.size());