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

net/tools/quic/quic_client_test.cc

 // Copyright (c) 2014 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/quic_client.h"
 
 #include <dirent.h>
 #include <stdio.h>
 
 #include <memory>
@@ skipping 25 matching lines @@
 
   return number_of_open_fds;
 }
 
 // Creates a new QuicClient and Initializes it. Caller is responsible for
 // deletion.
 QuicClient* CreateAndInitializeQuicClient(EpollServer* eps, uint16_t port) {
   IPEndPoint server_address(IPEndPoint(net::test::Loopback4(), port));
   QuicServerId server_id("hostname", server_address.port(),
                          PRIVACY_MODE_DISABLED);
-  QuicVersionVector versions = QuicSupportedVersions();
+  QuicVersionVector versions = AllSupportedVersions();
   QuicClient* client =
       new QuicClient(server_address, server_id, versions, eps,
                      CryptoTestUtils::ProofVerifierForTesting());
   EXPECT_TRUE(client->Initialize());
   return client;
 }
 
 TEST(QuicClientTest, DoNotLeakFDs) {
   // Create a ProofVerifier before counting the number of open FDs to work
   // around some ASAN weirdness.
@@ skipping 41 matching lines @@
   // Clean up UDP sockets.
   QuicClientPeer::CleanUpUDPSocket(client.get(), client->GetLatestFD());
   EXPECT_EQ(number_of_open_fds + 2, NumOpenFDs());
   QuicClientPeer::CleanUpUDPSocket(client.get(), client->GetLatestFD());
   EXPECT_EQ(number_of_open_fds + 1, NumOpenFDs());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net