Landing Recent QUIC changes until 5:30 PM, Feb 3, 2017 UTC-5

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 37 matching lines @@
 // Creates a new QuicClient and Initializes it. Caller is responsible for
 // deletion.
 QuicClient* CreateAndInitializeQuicClient(EpollServer* eps, uint16_t port) {
   QuicSocketAddress server_address(
       QuicSocketAddress(QuicIpAddress::Loopback4(), port));
   QuicServerId server_id("hostname", server_address.port(),
                          PRIVACY_MODE_DISABLED);
   QuicVersionVector versions = AllSupportedVersions();
   QuicClient* client =
       new QuicClient(server_address, server_id, versions, eps,
-                     CryptoTestUtils::ProofVerifierForTesting());
+                     crypto_test_utils::ProofVerifierForTesting());
   EXPECT_TRUE(client->Initialize());
   return client;
 }
 
 TEST(QuicClientTest, DoNotLeakFDs) {
   // Make sure that the QuicClient doesn't leak socket FDs. Doing so could cause
   // port exhaustion in long running processes which repeatedly create clients.
 
   // Create a ProofVerifier before counting the number of open FDs to work
   // around some ASAN weirdness.
-  CryptoTestUtils::ProofVerifierForTesting().reset();
+  crypto_test_utils::ProofVerifierForTesting().reset();
 
   // Make sure that the QuicClient doesn't leak FDs. Doing so could cause port
   // exhaustion in long running processes which repeatedly create clients.
 
   // Record initial number of FDs, after creation of EpollServer.
   EpollServer eps;
   size_t number_of_open_fds = NumOpenSocketFDs();
 
   // Create a number of clients, initialize them, and verify this has resulted
   // in additional FDs being opened.
   const int kNumClients = 50;
   for (int i = 0; i < kNumClients; ++i) {
     std::unique_ptr<QuicClient> client(
         CreateAndInitializeQuicClient(&eps, net::test::kTestPort + i));
 
     // Initializing the client will create a new FD.
     EXPECT_LT(number_of_open_fds, NumOpenSocketFDs());
   }
 
   // The FDs created by the QuicClients should now be closed.
   EXPECT_EQ(number_of_open_fds, NumOpenSocketFDs());
 }
 
 TEST(QuicClientTest, CreateAndCleanUpUDPSockets) {
   // Create a ProofVerifier before counting the number of open FDs to work
   // around some ASAN weirdness.
-  CryptoTestUtils::ProofVerifierForTesting().reset();
+  crypto_test_utils::ProofVerifierForTesting().reset();
 
   EpollServer eps;
   size_t number_of_open_fds = NumOpenSocketFDs();
 
   std::unique_ptr<QuicClient> client(
       CreateAndInitializeQuicClient(&eps, net::test::kTestPort));
   EXPECT_EQ(number_of_open_fds + 1, NumOpenSocketFDs());
   // Create more UDP sockets.
   EXPECT_TRUE(QuicClientPeer::CreateUDPSocketAndBind(client.get()));
   EXPECT_EQ(number_of_open_fds + 2, NumOpenSocketFDs());
   EXPECT_TRUE(QuicClientPeer::CreateUDPSocketAndBind(client.get()));
   EXPECT_EQ(number_of_open_fds + 3, NumOpenSocketFDs());
 
   // Clean up UDP sockets.
   QuicClientPeer::CleanUpUDPSocket(client.get(), client->GetLatestFD());
   EXPECT_EQ(number_of_open_fds + 2, NumOpenSocketFDs());
   QuicClientPeer::CleanUpUDPSocket(client.get(), client->GetLatestFD());
   EXPECT_EQ(number_of_open_fds + 1, NumOpenSocketFDs());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net