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

net/http/http_network_transaction_unittest.cc

Index: net/http/http_network_transaction_unittest.cc
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index cc7f6106e88a5efc4b9d15d21e2e2c87d8feb81d..aba2828919941d86b684290b57785fc5e65d5e6f 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -3691,22 +3691,22 @@
       spdy_util_.ConstructSpdyWindowUpdate(1, wrapped_body->size()));
 
   MockWrite spdy_writes[] = {
-      CreateMockWrite(*connect, 0),
-      CreateMockWrite(*wrapped_get, 2),
-      CreateMockWrite(*window_update_get_resp, 6),
+      CreateMockWrite(*connect, 1),
+      CreateMockWrite(*wrapped_get, 3),
+      CreateMockWrite(*window_update_get_resp, 5),
       CreateMockWrite(*window_update_body, 7),
   };
 
   MockRead spdy_reads[] = {
-      CreateMockRead(*conn_resp, 1, ASYNC),
-      MockRead(ASYNC, ERR_IO_PENDING, 3),
+      CreateMockRead(*conn_resp, 2, ASYNC),
       CreateMockRead(*wrapped_get_resp, 4, ASYNC),
-      CreateMockRead(*wrapped_body, 5, ASYNC),
+      CreateMockRead(*wrapped_body, 6, ASYNC),
       MockRead(ASYNC, 0, 8),
   };
 
-  SequencedSocketData spdy_data(spdy_reads, arraysize(spdy_reads), spdy_writes,
-                                arraysize(spdy_writes));
+  OrderedSocketData spdy_data(
+      spdy_reads, arraysize(spdy_reads),
+      spdy_writes, arraysize(spdy_writes));
   session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
 
   SSLSocketDataProvider ssl(ASYNC, OK);
@@ -3721,10 +3721,6 @@
   int rv = trans->Start(&request, callback1.callback(), log.bound());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
-  // Allow the SpdyProxyClientSocket's write callback to complete.
-  base::MessageLoop::current()->RunUntilIdle();
-  // Now allow the read of the response to complete.
-  spdy_data.CompleteRead();
   rv = callback1.WaitForResult();
   EXPECT_EQ(OK, rv);
 
@@ -11889,8 +11885,8 @@
       reads.push_back(MockRead(ASYNC, OK, 3));
     }
 
-    SequencedSocketData data(vector_as_array(&reads), reads.size(),
-                             vector_as_array(&writes), writes.size());
+    OrderedSocketData data(vector_as_array(&reads), reads.size(),
+                           vector_as_array(&writes), writes.size());
     session_deps_.socket_factory->AddSocketDataProvider(&data);
 
     // Connection to the origin fails.
@@ -11935,10 +11931,6 @@
 
     int rv = trans1->Start(&request1, callback1.callback(), BoundNetLog());
     EXPECT_EQ(ERR_IO_PENDING, rv);
-    base::MessageLoop::current()->RunUntilIdle();
-    if (data.IsReadPaused()) {
-      data.CompleteRead();
-    }
     rv = callback1.WaitForResult();
     if (valid) {
       EXPECT_EQ(OK, rv);