Simplify the interface to ProxyClientSocket::BuildTunnelRequest

net/http/proxy_client_socket.h

 // 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.
 
 #ifndef NET_HTTP_PROXY_CLIENT_SOCKET_H_
 #define NET_HTTP_PROXY_CLIENT_SOCKET_H_
 
 #include <string>
 
 #include "net/socket/ssl_client_socket.h"
@@ skipping 39 matching lines @@
   // Returns true of the connection to the proxy is using SPDY.
   virtual bool IsUsingSpdy() const = 0;
 
   // Returns the protocol negotiated with the proxy.
   virtual NextProto GetProtocolNegotiated() const = 0;
 
  protected:
   // The HTTP CONNECT method for establishing a tunnel connection is documented
   // in draft-luotonen-web-proxy-tunneling-01.txt and RFC 2817, Sections 5.2
   // and 5.3.
-  static void BuildTunnelRequest(const HttpRequestInfo& request_info,
+  static void BuildTunnelRequest(const HostPortPair& endpoint,
                                  const HttpRequestHeaders& auth_headers,
-                                 const HostPortPair& endpoint,
+                                 const std::string& user_agent,
                                  std::string* request_line,
                                  HttpRequestHeaders* request_headers);
 
   // When an auth challenge (407 response) is received during tunnel
   // construction/ this method should be called.
   static int HandleProxyAuthChallenge(HttpAuthController* auth,
                                       HttpResponseInfo* response,
                                       const BoundNetLog& net_log);
 
   // Logs (to the log and in a histogram) a blocked CONNECT response.
   static void LogBlockedTunnelResponse(int http_response_code,
-                                       const GURL& url,
                                        bool is_https_proxy);
 
   // When a proxy authentication response is received during tunnel
   // construction, this method should be called to strip everything
   // but the auth header from the redirect response.  If it returns
   // false, the response should be discarded and tunnel construction should
   // fail.
   static bool SanitizeProxyAuth(HttpResponseInfo* response);
 
   // When a redirect (e.g. 302 response) is received during tunnel
   // construction, this method should be called to strip everything
   // but the Location header from the redirect response.  If it returns
   // false, the response should be discarded and tunnel construction should
   // fail.
   static bool SanitizeProxyRedirect(HttpResponseInfo* response);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ProxyClientSocket);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_PROXY_CLIENT_SOCKET_H_