Remove insecure QUIC support

net/tools/quic/quic_client_test.cc

Index: net/tools/quic/quic_client_test.cc
diff --git a/net/tools/quic/quic_client_test.cc b/net/tools/quic/quic_client_test.cc
index e3a7270536f63e9a3972371110ce14c1a27b0ad7..8235dcecd2fbbf14f4d76a7c84f1d7aca6b041c7 100644
--- a/net/tools/quic/quic_client_test.cc
+++ b/net/tools/quic/quic_client_test.cc
@@ -9,11 +9,13 @@
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
+#include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/tools/epoll_server/epoll_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using net::EpollServer;
+using net::test::CryptoTestUtils;
 
 namespace net {
 namespace tools {
@@ -38,15 +40,21 @@ int NumOpenFDs() {
 // deletion.
 QuicClient* CreateAndInitializeQuicClient(EpollServer* eps, uint16 port) {
   IPEndPoint server_address(IPEndPoint(net::test::Loopback4(), port));
-  QuicServerId server_id("hostname", server_address.port(), false,
+  QuicServerId server_id("hostname", server_address.port(),
                          PRIVACY_MODE_DISABLED);
   QuicVersionVector versions = QuicSupportedVersions();
-  QuicClient* client = new QuicClient(server_address, server_id, versions, eps);
+  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.
+  delete CryptoTestUtils::ProofVerifierForTesting();
+
   // Make sure that the QuicClient doesn't leak FDs. Doing so could cause port
   // exhaustion in long running processes which repeatedly create clients.
 
@@ -56,7 +64,7 @@ TEST(QuicClientTest, DoNotLeakFDs) {
 
   // Create a number of clients, initialize them, and verify this has resulted
   // in additional FDs being opened.
-  const int kNumClients = 5;
+  const int kNumClients = 50;
   for (int i = 0; i < kNumClients; ++i) {
     scoped_ptr<QuicClient> client(
         CreateAndInitializeQuicClient(&eps, net::test::kTestPort + i));