Land Recent QUIC Changes.

Add convenience HighestPriority and LowestPriority methods to QuicUtils

Merge internal change: 58122394
https://codereview.chromium.org/112463003/


Change QUIC to only ack every other packet when there are no losses
within the last four received packets.

Merge internal change: 58111242
https://codereview.chromium.org/113123004/


Add a version() convenience method to ReliableQuicStream.

Merge internal change: 58110960
https://codereview.chromium.org/112273003/


Fix two tests that fail when FLAGS_enable_quic_pacing is enabled

Merge internal change: 58101756
https://codereview.chromium.org/115393003/


Remove deprecated flag FLAGS_pad_quic_handshake_packets.

Merge internal change: 58101024
https://codereview.chromium.org/114923007/


Remove the is_server argument from the QuicSession constructor.
In a previous CL, I removed this from TestSession, but I missed, that
it's an argument of the main QuicSession constructor.

Merge internal change: 58059515
https://codereview.chromium.org/102313005/


Fix QUIC's TCP style retransmission logic to only send a maximum of 2
packets per incoming ack instead of 10.

Merge internal change: 58059328
https://codereview.chromium.org/109993008/


Remove redundant |is_server| argument from TestSession and call the
connection's is_server() method instead.

Merge internal change: 58047118
https://codereview.chromium.org/110373004/


Minor cleanup of QUIC MockConnection and PacketSavingConnection
constructors.

Merge internal change: 58042657
https://codereview.chromium.org/114933003/


Cleanup in QUIC to merge the previous_transmissions_map in
QuicSentPacketManager with the unacked_packets map.

Merge internal change: 58011531
https://codereview.chromium.org/109323012/

R=rch@chromium.org

Review URL: https://codereview.chromium.org/115463002

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

1 files changed, 15 insertions, 26 deletions

diff --git a/net/tools/quic/quic_dispatcher_test.cc b/net/tools/quic/quic_dispatcher_test.cc
index 8db0678..74cab69 100644
--- a/net/tools/quic/quic_dispatcher_test.cc
+++ b/net/tools/quic/quic_dispatcher_test.cc
@@ -58,11 +58,8 @@ class TestDispatcher : public QuicDispatcher {
 class MockServerConnection : public MockConnection {
  public:
   MockServerConnection(QuicGuid guid,
-                       IPEndPoint address,
-                       int fd,
-                       EpollServer* eps,
                        QuicDispatcher* dispatcher)
-      : MockConnection(guid, address, fd, eps, true),
+      : MockConnection(guid, true),
         dispatcher_(dispatcher) {
   }
   void UnregisterOnConnectionClosed() {
@@ -76,11 +73,9 @@ class MockServerConnection : public MockConnection {
 QuicSession* CreateSession(QuicDispatcher* dispatcher,
                            QuicGuid guid,
                            const IPEndPoint& addr,
-                           MockSession** session,
-                           EpollServer* eps) {
-  MockServerConnection* connection =
-      new MockServerConnection(guid, addr, 0, eps, dispatcher);
-  *session = new MockSession(connection, true);
+                           MockSession** session) {
+  MockServerConnection* connection = new MockServerConnection(guid, dispatcher);
+  *session = new MockSession(connection);
   ON_CALL(*connection, SendConnectionClose(_)).WillByDefault(
       WithoutArgs(Invoke(
           connection, &MockServerConnection::UnregisterOnConnectionClosed)));
@@ -123,12 +118,6 @@ class QuicDispatcherTest : public ::testing::Test {
     EXPECT_TRUE(packet.AsStringPiece().find(data_) != StringPiece::npos);
   }
 
-  IPAddressNumber Loopback4() {
-    net::IPAddressNumber addr;
-    CHECK(net::ParseIPLiteralToNumber("127.0.0.1", &addr));
-    return addr;
-  }
-
   EpollServer eps_;
   QuicConfig config_;
   QuicCryptoServerConfig crypto_config_;
@@ -139,16 +128,16 @@ class QuicDispatcherTest : public ::testing::Test {
 };
 
 TEST_F(QuicDispatcherTest, ProcessPackets) {
-  IPEndPoint addr(Loopback4(), 1);
+  IPEndPoint addr(net::test::Loopback4(), 1);
 
   EXPECT_CALL(dispatcher_, CreateQuicSession(1, _, addr))
       .WillOnce(testing::Return(CreateSession(
-          &dispatcher_, 1, addr, &session1_, &eps_)));
+          &dispatcher_, 1, addr, &session1_)));
   ProcessPacket(addr, 1, true, "foo");
 
   EXPECT_CALL(dispatcher_, CreateQuicSession(2, _, addr))
       .WillOnce(testing::Return(CreateSession(
-                    &dispatcher_, 2, addr, &session2_, &eps_)));
+                    &dispatcher_, 2, addr, &session2_)));
   ProcessPacket(addr, 2, true, "bar");
 
   data_ = "eep";
@@ -160,11 +149,11 @@ TEST_F(QuicDispatcherTest, ProcessPackets) {
 }
 
 TEST_F(QuicDispatcherTest, Shutdown) {
-  IPEndPoint addr(Loopback4(), 1);
+  IPEndPoint addr(net::test::Loopback4(), 1);
 
   EXPECT_CALL(dispatcher_, CreateQuicSession(_, _, addr))
       .WillOnce(testing::Return(CreateSession(
-                    &dispatcher_, 1, addr, &session1_, &eps_)));
+                    &dispatcher_, 1, addr, &session1_)));
 
   ProcessPacket(addr, 1, true, "foo");
 
@@ -195,11 +184,11 @@ TEST_F(QuicDispatcherTest, TimeWaitListManager) {
   QuicDispatcherPeer::SetTimeWaitListManager(&dispatcher_,
                                              time_wait_list_manager);
   // Create a new session.
-  IPEndPoint addr(Loopback4(), 1);
+  IPEndPoint addr(net::test::Loopback4(), 1);
   QuicGuid guid = 1;
   EXPECT_CALL(dispatcher_, CreateQuicSession(guid, _, addr))
       .WillOnce(testing::Return(CreateSession(
-                    &dispatcher_, guid, addr, &session1_, &eps_)));
+                    &dispatcher_, guid, addr, &session1_)));
   ProcessPacket(addr, guid, true, "foo");
 
   // Close the connection by sending public reset packet.
@@ -237,7 +226,7 @@ TEST_F(QuicDispatcherTest, StrayPacketToTimeWaitListManager) {
   QuicDispatcherPeer::SetTimeWaitListManager(&dispatcher_,
                                              time_wait_list_manager);
 
-  IPEndPoint addr(Loopback4(), 1);
+  IPEndPoint addr(net::test::Loopback4(), 1);
   QuicGuid guid = 1;
   // Dispatcher forwards all packets for this guid to the time wait list
   // manager.
@@ -250,16 +239,16 @@ TEST_F(QuicDispatcherTest, StrayPacketToTimeWaitListManager) {
 class QuicWriteBlockedListTest : public QuicDispatcherTest {
  public:
   virtual void SetUp() {
-    IPEndPoint addr(Loopback4(), 1);
+    IPEndPoint addr(net::test::Loopback4(), 1);
 
     EXPECT_CALL(dispatcher_, CreateQuicSession(_, _, addr))
         .WillOnce(testing::Return(CreateSession(
-                      &dispatcher_, 1, addr, &session1_, &eps_)));
+                      &dispatcher_, 1, addr, &session1_)));
     ProcessPacket(addr, 1, true, "foo");
 
     EXPECT_CALL(dispatcher_, CreateQuicSession(_, _, addr))
         .WillOnce(testing::Return(CreateSession(
-                      &dispatcher_, 2, addr, &session2_, &eps_)));
+                      &dispatcher_, 2, addr, &session2_)));
     ProcessPacket(addr, 2, true, "bar");
 
     blocked_list_ = dispatcher_.write_blocked_list();