Revert of Add CompleteRead to SequencedSocketData and convert all but 3 tests

net/socket/socket_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/socket/socket_test_util.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 513 matching lines @@
 
 MockRead SequencedSocketData::OnRead() {
   CHECK_EQ(IDLE, read_state_);
   CHECK(!helper_.AllReadDataConsumed());
 
   NET_TRACE(1, " *** ") << "sequence_number: " << sequence_number_;
   const MockRead& next_read = helper_.PeekRead();
   NET_TRACE(1, " *** ") << "next_read: " << next_read.sequence_number;
   CHECK_GE(next_read.sequence_number, sequence_number_);
 
+  // Special case handling for hanging reads.
+  if (next_read.mode == ASYNC && next_read.result == ERR_IO_PENDING) {
+    NET_TRACE(1, " *** ") << "Hanging read";
+    helper_.AdvanceRead();
+    ++sequence_number_;
+    CHECK(helper_.AllReadDataConsumed());
+    return MockRead(SYNCHRONOUS, ERR_IO_PENDING);
+  }
+
   if (next_read.sequence_number <= sequence_number_) {
     if (next_read.mode == SYNCHRONOUS) {
       NET_TRACE(1, " *** ") << "Returning synchronously";
       DumpMockReadWrite(next_read);
       helper_.AdvanceRead();
       ++sequence_number_;
       MaybePostWriteCompleteTask();
       return next_read;
     }
 
-    // If the result is ERR_IO_PENDING, then advance to the next state
-    // and pause reads.
-    if (next_read.result == ERR_IO_PENDING) {
-      NET_TRACE(1, " *** ") << "Pausing at: " << sequence_number_;
-      ++sequence_number_;
-      helper_.AdvanceRead();
-      read_state_ = PAUSED;
-      return MockRead(SYNCHRONOUS, ERR_IO_PENDING);
-    }
     base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(&SequencedSocketData::OnReadComplete,
                               weak_factory_.GetWeakPtr()));
     CHECK_NE(COMPLETING, write_state_);
     read_state_ = COMPLETING;
   } else if (next_read.mode == SYNCHRONOUS) {
     ADD_FAILURE() << "Unable to perform synchronous IO while stopped";
     return MockRead(SYNCHRONOUS, ERR_UNEXPECTED);
   } else {
     NET_TRACE(1, " *** ") << "Waiting for write to trigger read";
@@ skipping 54 matching lines @@
 }
 
 bool SequencedSocketData::AllReadDataConsumed() const {
   return helper_.AllReadDataConsumed();
 }
 
 bool SequencedSocketData::AllWriteDataConsumed() const {
   return helper_.AllWriteDataConsumed();
 }
 
-bool SequencedSocketData::IsReadPaused() {
-  return read_state_ == PAUSED;
-}
-
-void SequencedSocketData::CompleteRead() {
-  if (read_state_ != PAUSED) {
-    ADD_FAILURE() << "Unable to CompleteRead when not paused.";
-    return;
-  }
-  read_state_ = COMPLETING;
-  OnReadComplete();
-}
-
 void SequencedSocketData::MaybePostReadCompleteTask() {
   NET_TRACE(1, " ****** ") << " current: " << sequence_number_;
   // Only trigger the next read to complete if there is already a read pending
   // which should complete at the current sequence number.
   if (read_state_ != PENDING ||
       helper_.PeekRead().sequence_number != sequence_number_) {
     return;
   }
 
-  // If the result is ERR_IO_PENDING, then advance to the next state
-  // and pause reads.
-  if (helper_.PeekRead().result == ERR_IO_PENDING) {
-    NET_TRACE(1, " *** ") << "Pausing read at: " << sequence_number_;
-    ++sequence_number_;
-    helper_.AdvanceRead();
-    read_state_ = PAUSED;
-    return;
-  }
-
   NET_TRACE(1, " ****** ") << "Posting task to complete read: "
                            << sequence_number_;
   base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(&SequencedSocketData::OnReadComplete,
                             weak_factory_.GetWeakPtr()));
   CHECK_NE(COMPLETING, write_state_);
   read_state_ = COMPLETING;
 }
 
 void SequencedSocketData::MaybePostWriteCompleteTask() {
@@ skipping 27 matching lines @@
   sequence_number_++;
   read_state_ = IDLE;
 
   // The result of this read completing might trigger the completion
   // of a pending write. If so, post a task to complete the write later.
   // Since the socket may call back into the SequencedSocketData
   // from socket()->OnReadComplete(), trigger the write task to be posted
   // before calling that.
   MaybePostWriteCompleteTask();
 
-  NET_TRACE(1, " *** ") << "Completing socket read for: "
-                        << data.sequence_number;
+  NET_TRACE(1, " *** ") << "Completing socket read for: " << sequence_number_;
   DumpMockReadWrite(data);
   socket()->OnReadComplete(data);
   NET_TRACE(1, " *** ") << "Done";
 }
 
 void SequencedSocketData::OnWriteComplete() {
   CHECK_EQ(COMPLETING, write_state_);
   NET_TRACE(1, " *** ") << " Completing write for: " << sequence_number_;
   if (!socket()) {
     NET_TRACE(1, " *** ") << "No socket available to complete write.";
     return;
   }
 
   const MockWrite& data = helper_.AdvanceWrite();
   DCHECK_EQ(sequence_number_, data.sequence_number);
   sequence_number_++;
   write_state_ = IDLE;
   int rv = data.result == OK ? data.data_len : data.result;
 
   // The result of this write completing might trigger the completion
   // of a pending read. If so, post a task to complete the read later.
   // Since the socket may call back into the SequencedSocketData
   // from socket()->OnWriteComplete(), trigger the write task to be posted
   // before calling that.
   MaybePostReadCompleteTask();
 
-  NET_TRACE(1, " *** ") << " Completing socket write for: "
-                        << data.sequence_number;
+  NET_TRACE(1, " *** ") << " Completing socket write for: " << sequence_number_;
   socket()->OnWriteComplete(rv);
   NET_TRACE(1, " *** ") << "Done";
 }
 
 SequencedSocketData::~SequencedSocketData() {
 }
 
 DeterministicSocketData::DeterministicSocketData(MockRead* reads,
     size_t reads_count, MockWrite* writes, size_t writes_count)
     : StaticSocketDataProvider(reads, reads_count, writes, writes_count),
@@ skipping 1474 matching lines @@
 
 const char kSOCKS5OkRequest[] =
     { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 };
 const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest);
 
 const char kSOCKS5OkResponse[] =
     { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 };
 const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse);
 
 }  // namespace net