Remove insecure QUIC support from Chromium.

net/tools/quic/quic_simple_client_bin.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.
 
 // A binary wrapper for QuicClient.
 // Connects to a host using QUIC, sends a request to the provided URL, and
 // displays the response.
 //
 // Some usage examples:
 //
@@ skipping 60 matching lines @@
 using std::cout;
 using std::cerr;
 using std::map;
 using std::string;
 using std::vector;
 using std::endl;
 
 // The IP or hostname the quic client will connect to.
 string FLAGS_host = "";
 // The port to connect to.
-int32 FLAGS_port = 80;
+int32 FLAGS_port = 0;
 // If set, send a POST with this body.
 string FLAGS_body = "";
 // A semicolon separated list of key:value pairs to add to request headers.
 string FLAGS_headers = "";
 // Set to true for a quieter output experience.
 bool FLAGS_quiet = false;
 // QUIC version to speak, e.g. 21. If not set, then all available versions are
 // offered in the handshake.
 int32 FLAGS_quic_version = -1;
 // If true, a version mismatch in the handshake is not considered a failure.
@@ skipping 91 matching lines @@
   // Determine IP address to connect to from supplied hostname.
   net::IPAddressNumber ip_addr;
 
   // TODO(rtenneti): GURL's doesn't support default_protocol argument, thus
   // protocol is required in the URL.
   GURL url(urls[0]);
   string host = FLAGS_host;
   if (host.empty()) {
     host = url.host();
   }
+  int port = FLAGS_port;
+  if (port == 0) {
+    port = url.EffectiveIntPort();
+  }
   if (!net::ParseIPLiteralToNumber(host, &ip_addr)) {
     net::AddressList addresses;
     int rv = net::tools::SynchronousHostResolver::Resolve(host, &addresses);
     if (rv != net::OK) {
       LOG(ERROR) << "Unable to resolve '" << host << "' : "
                  << net::ErrorToShortString(rv);
       return 1;
     }
     ip_addr = addresses[0].address();
   }
 
   string host_port = net::IPAddressToStringWithPort(ip_addr, FLAGS_port);
   VLOG(1) << "Resolved " << host << " to " << host_port << endl;
 
   // Build the client, and try to connect.
-  net::QuicServerId server_id(host, FLAGS_port, /*is_https=*/true,
-                              net::PRIVACY_MODE_DISABLED);
+  net::QuicServerId server_id(url.host(), url.EffectiveIntPort(),
+                              /*is_https=*/true, net::PRIVACY_MODE_DISABLED);
   net::QuicVersionVector versions = net::QuicSupportedVersions();
   if (FLAGS_quic_version != -1) {
     versions.clear();
     versions.push_back(static_cast<net::QuicVersion>(FLAGS_quic_version));
   }
-  net::tools::QuicSimpleClient client(net::IPEndPoint(ip_addr, FLAGS_port),
-                                      server_id, versions);
+  net::tools::QuicSimpleClient client(net::IPEndPoint(ip_addr, port), server_id,
+                                      versions);
   scoped_ptr<CertVerifier> cert_verifier;
   scoped_ptr<TransportSecurityState> transport_security_state;
   client.set_initial_max_packet_length(
       FLAGS_initial_mtu != 0 ? FLAGS_initial_mtu : net::kDefaultMaxPacketSize);
   // For secure QUIC we need to verify the cert chain.
   cert_verifier = CertVerifier::CreateDefault();
   transport_security_state.reset(new TransportSecurityState);
   client.SetProofVerifier(new ProofVerifierChromium(
       cert_verifier.get(), nullptr, transport_security_state.get()));
   if (!client.Initialize()) {
@@ skipping 72 matching lines @@
       return 0;
     } else {
       cout << "Request failed (redirect " << response_code << ")." << endl;
       return 1;
     }
   } else {
     cerr << "Request failed (" << response_code << ")." << endl;
     return 1;
   }
 }