Land Recent QUIC changes.

net/quic/quic_stream_factory_test.cc

Index: net/quic/quic_stream_factory_test.cc
diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc
index 608fdcf2ebb1135681675be1b5195f44ea42cf93..781d97155309aecbcf18d68eb310b58fc56cb72d 100644
--- a/net/quic/quic_stream_factory_test.cc
+++ b/net/quic/quic_stream_factory_test.cc
@@ -129,21 +129,12 @@ TEST_F(QuicStreamFactoryTest, CreateIfSessionExists) {
 }
 
 TEST_F(QuicStreamFactoryTest, Create) {
-  scoped_ptr<QuicEncryptedPacket> rst3(ConstructRstPacket(1, 3));
-  scoped_ptr<QuicEncryptedPacket> rst5(ConstructRstPacket(2, 5));
-  scoped_ptr<QuicEncryptedPacket> rst7(ConstructRstPacket(3, 7));
-  MockWrite writes[] = {
-    MockWrite(SYNCHRONOUS, rst3->data(), rst3->length(), 0),
-    MockWrite(SYNCHRONOUS, rst5->data(), rst5->length(), 1),
-    MockWrite(SYNCHRONOUS, rst7->data(), rst7->length(), 2),
-  };
   MockRead reads[] = {
-    MockRead(ASYNC, OK, 3)  // EOF
+    MockRead(ASYNC, OK, 0)  // EOF
   };
-  DeterministicSocketData socket_data(reads, arraysize(reads),
-                                      writes, arraysize(writes));
+  DeterministicSocketData socket_data(reads, arraysize(reads), NULL, 0);
   socket_factory_.AddSocketDataProvider(&socket_data);
-  socket_data.StopAfter(3);
+  socket_data.StopAfter(1);
 
   QuicStreamRequest request(&factory_);
   EXPECT_EQ(ERR_IO_PENDING, request.Request(host_port_proxy_pair_, net_log_,
@@ -163,8 +154,6 @@ TEST_F(QuicStreamFactoryTest, Create) {
   stream = request2.ReleaseStream();  // Will reset stream 5.
   stream.reset();  // Will reset stream 7.
 
-  socket_data.RunFor(1);
-
   EXPECT_TRUE(socket_data.at_read_eof());
   EXPECT_TRUE(socket_data.at_write_eof());
 }
@@ -186,16 +175,10 @@ TEST_F(QuicStreamFactoryTest, CreateError) {
 }
 
 TEST_F(QuicStreamFactoryTest, CancelCreate) {
-  scoped_ptr<QuicEncryptedPacket> rst3(ConstructRstPacket(1, 3));
-
-  MockWrite writes[] = {
-    MockWrite(SYNCHRONOUS, rst3->data(), rst3->length(), 0),
-  };
   MockRead reads[] = {
-    MockRead(ASYNC, OK, 1)  // EOF
+    MockRead(ASYNC, OK, 0)  // EOF
   };
-  DeterministicSocketData socket_data(reads, arraysize(reads),
-                                      writes, arraysize(writes));
+  DeterministicSocketData socket_data(reads, arraysize(reads), NULL, 0);
   socket_factory_.AddSocketDataProvider(&socket_data);
   {
     QuicStreamRequest request(&factory_);
@@ -203,7 +186,7 @@ TEST_F(QuicStreamFactoryTest, CancelCreate) {
                                               callback_.callback()));
   }
 
-  socket_data.StopAfter(2);
+  socket_data.StopAfter(1);
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 
@@ -212,30 +195,22 @@ TEST_F(QuicStreamFactoryTest, CancelCreate) {
   EXPECT_TRUE(stream.get());
   stream.reset();
 
-  socket_data.RunFor(1);
-
   EXPECT_TRUE(socket_data.at_read_eof());
   EXPECT_TRUE(socket_data.at_write_eof());
 }
 
 TEST_F(QuicStreamFactoryTest, CloseAllSessions) {
-  scoped_ptr<QuicEncryptedPacket> rst3(ConstructRstPacket(1, 3));
   MockRead reads[] = {
     MockRead(ASYNC, 0, 0)  // EOF
   };
-  DeterministicSocketData socket_data(reads, arraysize(reads),
-                                      NULL, 0);
+  DeterministicSocketData socket_data(reads, arraysize(reads), NULL, 0);
   socket_factory_.AddSocketDataProvider(&socket_data);
   socket_data.StopAfter(1);
 
-  MockWrite writes2[] = {
-    MockWrite(SYNCHRONOUS, rst3->data(), rst3->length(), 0),
-  };
   MockRead reads2[] = {
-    MockRead(ASYNC, 0, 1)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
-  DeterministicSocketData socket_data2(reads2, arraysize(reads2),
-                                        writes2, arraysize(writes2));
+  DeterministicSocketData socket_data2(reads2, arraysize(reads2), NULL, 0);
   socket_factory_.AddSocketDataProvider(&socket_data2);
   socket_data2.StopAfter(1);
 
@@ -262,8 +237,6 @@ TEST_F(QuicStreamFactoryTest, CloseAllSessions) {
   stream = request2.ReleaseStream();
   stream.reset();  // Will reset stream 3.
 
-  socket_data2.RunFor(1);
-
   EXPECT_TRUE(socket_data.at_read_eof());
   EXPECT_TRUE(socket_data.at_write_eof());
   EXPECT_TRUE(socket_data2.at_read_eof());
@@ -271,23 +244,17 @@ TEST_F(QuicStreamFactoryTest, CloseAllSessions) {
 }
 
 TEST_F(QuicStreamFactoryTest, OnIPAddressChanged) {
-  scoped_ptr<QuicEncryptedPacket> rst3(ConstructRstPacket(1, 3));
   MockRead reads[] = {
     MockRead(ASYNC, 0, 0)  // EOF
   };
-  DeterministicSocketData socket_data(reads, arraysize(reads),
-                                      NULL, 0);
+  DeterministicSocketData socket_data(reads, arraysize(reads), NULL, 0);
   socket_factory_.AddSocketDataProvider(&socket_data);
   socket_data.StopAfter(1);
 
-  MockWrite writes2[] = {
-    MockWrite(SYNCHRONOUS, rst3->data(), rst3->length(), 0),
-  };
   MockRead reads2[] = {
-    MockRead(ASYNC, 0, 1)  // EOF
+    MockRead(ASYNC, 0, 0)  // EOF
   };
-  DeterministicSocketData socket_data2(reads2, arraysize(reads2),
-                                        writes2, arraysize(writes2));
+  DeterministicSocketData socket_data2(reads2, arraysize(reads2), NULL, 0);
   socket_factory_.AddSocketDataProvider(&socket_data2);
   socket_data2.StopAfter(1);
 
@@ -314,8 +281,6 @@ TEST_F(QuicStreamFactoryTest, OnIPAddressChanged) {
   stream = request2.ReleaseStream();
   stream.reset();  // Will reset stream 3.
 
-  socket_data2.RunFor(1);
-
   EXPECT_TRUE(socket_data.at_read_eof());
   EXPECT_TRUE(socket_data.at_write_eof());
   EXPECT_TRUE(socket_data2.at_read_eof());