Land Recent QUIC changes.

net/tools/quic/test_tools/quic_test_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/tools/quic/test_tools/quic_test_utils.h"
 
 #include "base/sha1.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/test_tools/quic_connection_peer.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/tools/quic/quic_epoll_connection_helper.h"
 
 using base::StringPiece;
 using net::test::MockHelper;
 
 namespace net {
 namespace tools {
 namespace test {
 
+QuicVersion QuicVersionMax() { return QuicSupportedVersions().front(); }
+
+QuicVersion QuicVersionMin() { return QuicSupportedVersions().back(); }
+
 MockConnection::MockConnection(QuicGuid guid,
                                IPEndPoint address,
                                int fd,
                                EpollServer* eps,
                                bool is_server)
     : QuicConnection(guid, address,
                      new QuicEpollConnectionHelper(eps),
                      new QuicDefaultPacketWriter(fd), is_server,
-                     QuicVersionMax()),
+                     QuicSupportedVersions()),
       has_mock_helper_(false),
       writer_(net::test::QuicConnectionPeer::GetWriter(this)),
       helper_(helper()) {
 }
 
 MockConnection::MockConnection(QuicGuid guid,
                                IPEndPoint address,
                                bool is_server)
     : QuicConnection(guid, address, new testing::NiceMock<MockHelper>(),
                      new testing::NiceMock<MockPacketWriter>(),
-                     is_server, QuicVersionMax()),
+                     is_server, QuicSupportedVersions()),
       has_mock_helper_(true),
       writer_(net::test::QuicConnectionPeer::GetWriter(this)),
       helper_(helper()) {
 }
 
 MockConnection::MockConnection(QuicGuid guid,
                                IPEndPoint address,
                                QuicConnectionHelperInterface* helper,
                                QuicPacketWriter* writer,
                                bool is_server)
     : QuicConnection(guid, address, helper, writer, is_server,
-                     QuicVersionMax()),
+                     QuicSupportedVersions()),
       has_mock_helper_(false) {
 }
 
 MockConnection::~MockConnection() {
 }
 
 void MockConnection::AdvanceTime(QuicTime::Delta delta) {
   CHECK(has_mock_helper_) << "Cannot advance time unless a MockClock is being"
                              " used";
   static_cast<MockHelper*>(helper())->AdvanceTime(delta);
@@ skipping 47 matching lines @@
 
 MockPacketWriter::MockPacketWriter() {
 }
 
 MockPacketWriter::~MockPacketWriter() {
 }
 
 }  // namespace test
 }  // namespace tools
 }  // namespace net