Landing Recent QUIC changes until 4AM, Aug 7, 2016 UTC-4

net/quic/test_tools/quic_test_utils.cc

Index: net/quic/test_tools/quic_test_utils.cc
diff --git a/net/quic/test_tools/quic_test_utils.cc b/net/quic/test_tools/quic_test_utils.cc
index d447126bcf7011a6c78253aadef6e25f6b286ae2..9ba720811e33574dfc0971278c55d4e428923879 100644
--- a/net/quic/test_tools/quic_test_utils.cc
+++ b/net/quic/test_tools/quic_test_utils.cc
@@ -251,7 +251,7 @@ MockQuicConnection::MockQuicConnection(MockQuicConnectionHelper* helper,
                          helper,
                          alarm_factory,
                          perspective,
-                         QuicSupportedVersions()) {}
+                         AllSupportedVersions()) {}
 
 MockQuicConnection::MockQuicConnection(IPEndPoint address,
                                        MockQuicConnectionHelper* helper,
@@ -262,7 +262,7 @@ MockQuicConnection::MockQuicConnection(IPEndPoint address,
                          helper,
                          alarm_factory,
                          perspective,
-                         QuicSupportedVersions()) {}
+                         AllSupportedVersions()) {}
 
 MockQuicConnection::MockQuicConnection(QuicConnectionId connection_id,
                                        MockQuicConnectionHelper* helper,
@@ -273,7 +273,7 @@ MockQuicConnection::MockQuicConnection(QuicConnectionId connection_id,
                          helper,
                          alarm_factory,
                          perspective,
-                         QuicSupportedVersions()) {}
+                         CurrentSupportedVersions()) {}
 
 MockQuicConnection::MockQuicConnection(
     MockQuicConnectionHelper* helper,
@@ -350,7 +350,9 @@ MockQuicSession::MockQuicSession(QuicConnection* connection)
       .WillByDefault(testing::Return(QuicConsumedData(0, false)));
 }
 
-MockQuicSession::~MockQuicSession() {}
+MockQuicSession::~MockQuicSession() {
+  delete connection();
+}
 
 // static
 QuicConsumedData MockQuicSession::ConsumeAllData(
@@ -371,7 +373,9 @@ MockQuicSpdySession::MockQuicSpdySession(QuicConnection* connection)
       .WillByDefault(testing::Return(QuicConsumedData(0, false)));
 }
 
-MockQuicSpdySession::~MockQuicSpdySession() {}
+MockQuicSpdySession::~MockQuicSpdySession() {
+  delete connection();
+}
 
 TestQuicSpdyServerSession::TestQuicSpdyServerSession(
     QuicConnection* connection,
@@ -392,7 +396,9 @@ TestQuicSpdyServerSession::TestQuicSpdyServerSession(
       .WillByDefault(testing::Return(true));
 }
 
-TestQuicSpdyServerSession::~TestQuicSpdyServerSession() {}
+TestQuicSpdyServerSession::~TestQuicSpdyServerSession() {
+  delete connection();
+}
 
 QuicCryptoServerStreamBase*
 TestQuicSpdyServerSession::CreateQuicCryptoServerStream(
@@ -502,11 +508,11 @@ IPAddress TestPeerIPAddress() {
 }
 
 QuicVersion QuicVersionMax() {
-  return QuicSupportedVersions().front();
+  return AllSupportedVersions().front();
 }
 
 QuicVersion QuicVersionMin() {
-  return QuicSupportedVersions().back();
+  return AllSupportedVersions().back();
 }
 
 IPAddress Loopback4() {
@@ -601,8 +607,9 @@ QuicEncryptedPacket* ConstructEncryptedPacket(
   QuicFrame frame(&stream_frame);
   QuicFrames frames;
   frames.push_back(frame);
-  QuicFramer framer(versions != nullptr ? *versions : QuicSupportedVersions(),
-                    QuicTime::Zero(), perspective);
+  QuicFramer framer(
+      versions != nullptr ? *versions : CurrentSupportedVersions(),
+      QuicTime::Zero(), perspective);
 
   std::unique_ptr<QuicPacket> packet(
       BuildUnsizedDataPacket(&framer, header, frames));
@@ -651,7 +658,7 @@ QuicEncryptedPacket* ConstructMisFramedEncryptedPacket(
   QuicFrame frame(&stream_frame);
   QuicFrames frames;
   frames.push_back(frame);
-  QuicFramer framer(versions != nullptr ? *versions : QuicSupportedVersions(),
+  QuicFramer framer(versions != nullptr ? *versions : AllSupportedVersions(),
                     QuicTime::Zero(), perspective);
 
   std::unique_ptr<QuicPacket> packet(
@@ -730,7 +737,7 @@ static QuicPacket* ConstructPacketFromHandshakeMessage(
   CryptoFramer crypto_framer;
   std::unique_ptr<QuicData> data(
       crypto_framer.ConstructHandshakeMessage(message));
-  QuicFramer quic_framer(QuicSupportedVersions(), QuicTime::Zero(),
+  QuicFramer quic_framer(AllSupportedVersions(), QuicTime::Zero(),
                          Perspective::IS_CLIENT);
 
   QuicPacketHeader header;