From 8f547ea7edbf6bfd0d94dea2d9a250af0bc422ab Mon Sep 17 00:00:00 2001 From: "rtenneti@chromium.org" Date: Thu, 24 Oct 2013 05:55:04 +0000 Subject: 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 --- net/quic/quic_http_stream_test.cc | 4 ---- 1 file changed, 4 deletions(-) (limited to 'net/quic/quic_http_stream_test.cc') diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc index b7c0522..5995c44 100644 --- a/net/quic/quic_http_stream_test.cc +++ b/net/quic/quic_http_stream_test.cc @@ -140,8 +140,6 @@ class QuicHttpStreamTest : public ::testing::TestWithParam { CHECK(ParseIPLiteralToNumber("192.0.2.33", &ip)); peer_addr_ = IPEndPoint(ip, 443); self_addr_ = IPEndPoint(ip, 8435); - // TODO(rch): remove this. - QuicConnection::g_acks_do_not_instigate_acks = true; } ~QuicHttpStreamTest() { @@ -149,8 +147,6 @@ class QuicHttpStreamTest : public ::testing::TestWithParam { for (size_t i = 0; i < writes_.size(); i++) { delete writes_[i].packet; } - // TODO(rch): remove this. - QuicConnection::g_acks_do_not_instigate_acks = false; } // Adds a packet to the list of expected writes. -- cgit v1.1