Land Recent QUIC changes.

Remove unused arguments from QuicDispatcher::CreateQuicSession.

Merge internal change: 53968573

Adding the ability to simulate delay on the network as well as packet
reordering in order to improve QUIC testing.

Merge internal change: 53935720

Remove FLAGS_gfe2_reloadable_flag_acks_do_not_instigate_acks

Merge internal change: 53924964

Added FramePackingAckResponse to QuicConnectionTest.

Remove Aes128Gcm12Encrypter::IsSupported() as it is always true.

Merge internal change: 53924418

Removing QUIC_VERSION_9.

Merge internal change: 53923913

Plumb a mechanism for tests to specify a GUID for the client to use in
QuicTestClient. Also fix a bug where the test client's auto-reconnect
feature would trigger an assertion failure.

Merge internal change: 53908646

Remove undefined and unused method StringToQuicTag

Merge internal change: 53897915

Add tracking of stream bytes sent and received to the
QuicConnectionStats.

Merge internal change: 53871937

R=rch@chromium.org

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

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

1 files changed, 8 insertions, 10 deletions

diff --git a/net/tools/quic/quic_dispatcher_test.cc b/net/tools/quic/quic_dispatcher_test.cc
index 0d7407a..651f224 100644
--- a/net/tools/quic/quic_dispatcher_test.cc
+++ b/net/tools/quic/quic_dispatcher_test.cc
@@ -43,11 +43,9 @@ class TestDispatcher : public QuicDispatcher {
                           EpollServer* eps)
       : QuicDispatcher(config, crypto_config, 1, eps) {}
 
-  MOCK_METHOD4(CreateQuicSession, QuicSession*(
+  MOCK_METHOD2(CreateQuicSession, QuicSession*(
       QuicGuid guid,
-      const IPEndPoint& client_address,
-      int fd,
-      EpollServer* eps));
+      const IPEndPoint& client_address));
   using QuicDispatcher::write_blocked_list;
 };
 
@@ -139,12 +137,12 @@ class QuicDispatcherTest : public ::testing::Test {
 TEST_F(QuicDispatcherTest, ProcessPackets) {
   IPEndPoint addr(Loopback4(), 1);
 
-  EXPECT_CALL(dispatcher_, CreateQuicSession(1, addr, _, &eps_))
+  EXPECT_CALL(dispatcher_, CreateQuicSession(1, addr))
       .WillOnce(testing::Return(CreateSession(
           &dispatcher_, 1, addr, &session1_, &eps_)));
   ProcessPacket(addr, 1, "foo");
 
-  EXPECT_CALL(dispatcher_, CreateQuicSession(2, addr, _, &eps_))
+  EXPECT_CALL(dispatcher_, CreateQuicSession(2, addr))
       .WillOnce(testing::Return(CreateSession(
                     &dispatcher_, 2, addr, &session2_, &eps_)));
   ProcessPacket(addr, 2, "bar");
@@ -160,7 +158,7 @@ TEST_F(QuicDispatcherTest, ProcessPackets) {
 TEST_F(QuicDispatcherTest, Shutdown) {
   IPEndPoint addr(Loopback4(), 1);
 
-  EXPECT_CALL(dispatcher_, CreateQuicSession(_, addr, _, &eps_))
+  EXPECT_CALL(dispatcher_, CreateQuicSession(_, addr))
       .WillOnce(testing::Return(CreateSession(
                     &dispatcher_, 1, addr, &session1_, &eps_)));
 
@@ -195,7 +193,7 @@ TEST_F(QuicDispatcherTest, TimeWaitListManager) {
   // Create a new session.
   IPEndPoint addr(Loopback4(), 1);
   QuicGuid guid = 1;
-  EXPECT_CALL(dispatcher_, CreateQuicSession(guid, addr, _, &eps_))
+  EXPECT_CALL(dispatcher_, CreateQuicSession(guid, addr))
       .WillOnce(testing::Return(CreateSession(
                     &dispatcher_, guid, addr, &session1_, &eps_)));
   ProcessPacket(addr, guid, "foo");
@@ -232,12 +230,12 @@ class QuicWriteBlockedListTest : public QuicDispatcherTest {
   virtual void SetUp() {
     IPEndPoint addr(Loopback4(), 1);
 
-    EXPECT_CALL(dispatcher_, CreateQuicSession(_, addr, _, &eps_))
+    EXPECT_CALL(dispatcher_, CreateQuicSession(_, addr))
         .WillOnce(testing::Return(CreateSession(
                       &dispatcher_, 1, addr, &session1_, &eps_)));
     ProcessPacket(addr, 1, "foo");
 
-    EXPECT_CALL(dispatcher_, CreateQuicSession(_, addr, _, &eps_))
+    EXPECT_CALL(dispatcher_, CreateQuicSession(_, addr))
         .WillOnce(testing::Return(CreateSession(
                       &dispatcher_, 2, addr, &session2_, &eps_)));
     ProcessPacket(addr, 2, "bar");