Land Recent QUIC changes.

net/quic/quic_stream_factory_test.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/quic/quic_stream_factory.h"
 
 #include "base/run_loop.h"
 #include "base/string_util.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/http/http_response_headers.h"
@@ skipping 111 matching lines @@
   BoundNetLog net_log_;
   TestCompletionCallback callback_;
 };
 
 TEST_F(QuicStreamFactoryTest, CreateIfSessionExists) {
   EXPECT_EQ(NULL, factory_.CreateIfSessionExists(host_port_proxy_pair_,
                                                  net_log_).get());
 }
 
 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, 0)  // EOF
   };
-  MockRead reads[] = {
-    MockRead(ASYNC, OK, 3)  // 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_,
                                             callback_.callback()));
 
   EXPECT_EQ(OK, callback_.WaitForResult());
   scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
   EXPECT_TRUE(stream.get());
 
   // Will reset stream 3.
   stream = factory_.CreateIfSessionExists(host_port_proxy_pair_, net_log_);
   EXPECT_TRUE(stream.get());
 
   QuicStreamRequest request2(&factory_);
   EXPECT_EQ(OK, request2.Request(host_port_proxy_pair_, net_log_,
                                  callback_.callback()));
   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());
 }
 
 TEST_F(QuicStreamFactoryTest, CreateError) {
   DeterministicSocketData socket_data(NULL, 0, NULL, 0);
   socket_factory_.AddSocketDataProvider(&socket_data);
 
   host_resolver_.rules()->AddSimulatedFailure("www.google.com");
 
   QuicStreamRequest request(&factory_);
   EXPECT_EQ(ERR_IO_PENDING, request.Request(host_port_proxy_pair_, net_log_,
                                             callback_.callback()));
 
   EXPECT_EQ(ERR_NAME_NOT_RESOLVED, callback_.WaitForResult());
 
   EXPECT_TRUE(socket_data.at_read_eof());
   EXPECT_TRUE(socket_data.at_write_eof());
 }
 
 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, 0)  // EOF
   };
-  MockRead reads[] = {
-    MockRead(ASYNC, OK, 1)  // 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_);
     EXPECT_EQ(ERR_IO_PENDING, request.Request(host_port_proxy_pair_, net_log_,
                                               callback_.callback()));
   }
 
-  socket_data.StopAfter(2);
+  socket_data.StopAfter(1);
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 
   scoped_ptr<QuicHttpStream> stream(
       factory_.CreateIfSessionExists(host_port_proxy_pair_, net_log_));
   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, 0)  // EOF
   };
-  MockRead reads2[] = {
-    MockRead(ASYNC, 0, 1)  // 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);
 
   QuicStreamRequest request(&factory_);
   EXPECT_EQ(ERR_IO_PENDING, request.Request(host_port_proxy_pair_, net_log_,
                                             callback_.callback()));
 
   EXPECT_EQ(OK, callback_.WaitForResult());
   scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
 
   // Close the session and verify that stream saw the error.
   factory_.CloseAllSessions(ERR_INTERNET_DISCONNECTED);
   EXPECT_EQ(ERR_INTERNET_DISCONNECTED,
             stream->ReadResponseHeaders(callback_.callback()));
 
   // Now attempting to request a stream to the same origin should create
   // a new session.
 
   QuicStreamRequest request2(&factory_);
   EXPECT_EQ(ERR_IO_PENDING, request2.Request(host_port_proxy_pair_, net_log_,
                                              callback_.callback()));
 
   EXPECT_EQ(OK, callback_.WaitForResult());
   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());
   EXPECT_TRUE(socket_data2.at_write_eof());
 }
 
 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, 0)  // EOF
   };
-  MockRead reads2[] = {
-    MockRead(ASYNC, 0, 1)  // 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);
 
   QuicStreamRequest request(&factory_);
   EXPECT_EQ(ERR_IO_PENDING, request.Request(host_port_proxy_pair_, net_log_,
                                             callback_.callback()));
 
   EXPECT_EQ(OK, callback_.WaitForResult());
   scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
 
   // Change the IP address and verify that stream saw the error.
   factory_.OnIPAddressChanged();
   EXPECT_EQ(ERR_NETWORK_CHANGED,
             stream->ReadResponseHeaders(callback_.callback()));
 
   // Now attempting to request a stream to the same origin should create
   // a new session.
 
   QuicStreamRequest request2(&factory_);
   EXPECT_EQ(ERR_IO_PENDING, request2.Request(host_port_proxy_pair_, net_log_,
                                              callback_.callback()));
 
   EXPECT_EQ(OK, callback_.WaitForResult());
   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());
   EXPECT_TRUE(socket_data2.at_write_eof());
 }
 
 }  // namespace test
 }  // namespace net