Revert of Add a chromium based simple QUIC client.

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 31 matching lines @@
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/privacy_mode.h"
 #include "net/cert/cert_verifier.h"
-#include "net/http/http_request_info.h"
 #include "net/http/transport_security_state.h"
 #include "net/quic/crypto/proof_verifier_chromium.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_server_id.h"
 #include "net/quic/quic_utils.h"
-#include "net/spdy/spdy_http_utils.h"
-#include "net/tools/quic/quic_simple_client.h"
+#include "net/tools/epoll_server/epoll_server.h"
+#include "net/tools/quic/quic_client.h"
+#include "net/tools/quic/spdy_utils.h"
 #include "url/gurl.h"
 
 using base::StringPiece;
 using net::CertVerifier;
 using net::ProofVerifierChromium;
 using net::TransportSecurityState;
 using std::cout;
 using std::cerr;
 using std::map;
 using std::string;
@@ skipping 84 matching lines @@
   }
 
   VLOG(1) << "server host: " << FLAGS_host << " port: " << FLAGS_port
           << " body: " << FLAGS_body << " headers: " << FLAGS_headers
           << " quiet: " << FLAGS_quiet
           << " quic-version: " << FLAGS_quic_version
           << " version_mismatch_ok: " << FLAGS_version_mismatch_ok
           << " redirect_is_success: " << FLAGS_redirect_is_success;
 
   base::AtExitManager exit_manager;
-  base::MessageLoopForIO message_loop;
 
   // 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;
   // TODO(rtenneti): get ip_addr from hostname by doing host resolution.
   if (host.empty()) {
     LOG(ERROR) << "--host must be specified\n";
     return 1;
   }
   if (!net::ParseIPLiteralToNumber(host, &ip_addr)) {
     LOG(ERROR) << "--host could not be parsed as an IP address\n";
     return 1;
   }
 
   string host_port = net::IPAddressToStringWithPort(ip_addr, FLAGS_port);
   VLOG(1) << "Resolved " << host << " to " << host_port << endl;
 
   // Build the client, and try to connect.
   bool is_https = (FLAGS_port == 443);
+  net::EpollServer epoll_server;
   net::QuicServerId server_id(host, FLAGS_port, is_https,
                               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::QuicClient client(net::IPEndPoint(ip_addr, FLAGS_port), server_id,
+                                versions, &epoll_server);
   scoped_ptr<CertVerifier> cert_verifier;
   scoped_ptr<TransportSecurityState> transport_security_state;
   if (is_https) {
     // For secure QUIC we need to verify the cert chain.a
     cert_verifier.reset(CertVerifier::CreateDefault());
     transport_security_state.reset(new TransportSecurityState);
     // TODO(rtenneti): Fix "Proof invalid: Missing context" error.
     client.SetProofVerifier(new ProofVerifierChromium(
         cert_verifier.get(), transport_security_state.get()));
   }
   if (!client.Initialize()) {
     cerr << "Failed to initialize client." << endl;
     return 1;
   }
   if (!client.Connect()) {
     net::QuicErrorCode error = client.session()->error();
     if (FLAGS_version_mismatch_ok && error == net::QUIC_INVALID_VERSION) {
       cout << "Server talks QUIC, but none of the versions supoorted by "
            << "this client: " << QuicVersionVectorToString(versions) << endl;
       // Version mismatch is not deemed a failure.
       return 0;
     }
     cerr << "Failed to connect to " << host_port
          << ". Error: " << net::QuicUtils::ErrorToString(error) << endl;
     return 1;
   }
   cout << "Connected to " << host_port << endl;
 
   // Construct a GET or POST request for supplied URL.
-  net::HttpRequestInfo request;
-  request.method = FLAGS_body.empty() ? "GET" : "POST";
-  request.url = url;
+  net::BalsaHeaders headers;
+  headers.SetRequestFirstlineFromStringPieces(
+      FLAGS_body.empty() ? "GET" : "POST", url.spec(), "HTTP/1.1");
 
   // Append any additional headers supplied on the command line.
   vector<string> headers_tokenized;
   Tokenize(FLAGS_headers, ";", &headers_tokenized);
   for (size_t i = 0; i < headers_tokenized.size(); ++i) {
     string sp;
     base::TrimWhitespaceASCII(headers_tokenized[i], base::TRIM_ALL, &sp);
     if (sp.empty()) {
       continue;
     }
     vector<string> kv;
     base::SplitString(sp, ':', &kv);
     CHECK_EQ(2u, kv.size());
     string key;
     base::TrimWhitespaceASCII(kv[0], base::TRIM_ALL, &key);
     string value;
     base::TrimWhitespaceASCII(kv[1], base::TRIM_ALL, &value);
-    request.extra_headers.SetHeader(key, value);
+    headers.AppendHeader(key, value);
   }
 
   // Make sure to store the response, for later output.
   client.set_store_response(true);
 
   // Send the request.
-  net::SpdyHeaderBlock header_block;
-  net::CreateSpdyHeadersFromHttpRequest(request, request.extra_headers,
-                                        net::SPDY3, /*direct=*/ true,
-                                        &header_block);
-  client.SendRequestAndWaitForResponse(request, FLAGS_body, /*fin=*/true);
+  map<string, string> header_block =
+      net::tools::SpdyUtils::RequestHeadersToSpdy4Headers(headers);
+  client.SendRequestAndWaitForResponse(headers, FLAGS_body, /*fin=*/true);
 
   // Print request and response details.
   if (!FLAGS_quiet) {
     cout << "Request:" << endl;
     cout << "headers:" << endl;
     for (const std::pair<string, string>& kv : header_block) {
       cout << " " << kv.first << ": " << kv.second << endl;
     }
     cout << "body: " << FLAGS_body << endl;
-    cout << endl;
-    cout << "Response:" << endl;
+    cout << endl << "Response:";
     cout << "headers: " << client.latest_response_headers() << endl;
     cout << "body: " << client.latest_response_body() << endl;
   }
 
   size_t response_code = client.latest_response_code();
   if (response_code >= 200 && response_code < 300) {
     cout << "Request succeeded (" << response_code << ")." << endl;
     return 0;
   } else if (response_code >= 300 && response_code < 400) {
     if (FLAGS_redirect_is_success) {
       cout << "Request succeeded (redirect " << response_code << ")." << endl;
       return 0;
     } else {
       cout << "Request failed (redirect " << response_code << ")." << endl;
       return 1;
     }
   } else {
     cerr << "Request failed (" << response_code << ")." << endl;
     return 1;
   }
 }