Land Recent QUIC Changes.

net/tools/quic/end_to_end_test.cc

Index: net/tools/quic/end_to_end_test.cc
diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc
index 0f4eae4442e775bf6f14c1cba58826e9f374f563..04dc745fad80d928a0e0367392fbf97fed279713 100644
--- a/net/tools/quic/end_to_end_test.cc
+++ b/net/tools/quic/end_to_end_test.cc
@@ -44,6 +44,7 @@ using net::test::ReliableQuicStreamPeer;
 using net::tools::test::PacketDroppingTestWriter;
 using net::tools::test::QuicDispatcherPeer;
 using net::tools::test::QuicServerPeer;
+using std::ostream;
 using std::string;
 using std::vector;
 
@@ -76,6 +77,16 @@ struct TestParams {
         use_padding(use_padding) {
   }
 
+  friend ostream& operator<<(ostream& os, const TestParams& p) {
+    os << "{ server_supported_versions: "
+       << QuicVersionVectorToString(p.server_supported_versions);
+    os << " client_supported_versions: "
+       << QuicVersionVectorToString(p.client_supported_versions);
+    os << " negotiated_version: " << QuicVersionToString(p.negotiated_version);
+    os << " use_padding: " << p.use_padding << " }";
+    return os;
+  }
+
   QuicVersionVector client_supported_versions;
   QuicVersionVector server_supported_versions;
   QuicVersion negotiated_version;
@@ -138,7 +149,6 @@ class EndToEndTest : public ::testing::TestWithParam<TestParams> {
     net::IPAddressNumber ip;
     CHECK(net::ParseIPLiteralToNumber("127.0.0.1", &ip));
     server_address_ = IPEndPoint(ip, 0);
-    FLAGS_track_retransmission_history = true;
     client_config_.SetDefaults();
     server_config_.SetDefaults();
     server_config_.set_initial_round_trip_time_us(kMaxInitialRoundTripTimeUs,