Make a proper TCPSocketParams

net/http/http_network_transaction.cc

 // Copyright (c) 2010 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/http/http_network_transaction.h"
 
 #include "base/format_macros.h"
 #include "base/scoped_ptr.h"
 #include "base/compiler_specific.h"
 #include "base/field_trial.h"
@@ skipping 15 matching lines @@
 #include "net/http/http_chunked_decoder.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/http/http_util.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/socks5_client_socket.h"
 #include "net/socket/socks_client_socket.h"
 #include "net/socket/ssl_client_socket.h"
+#include "net/socket/tcp_client_socket_pool.h"
 #include "net/spdy/spdy_session.h"
 #include "net/spdy/spdy_session_pool.h"
 #include "net/spdy/spdy_stream.h"
 
 using base::Time;
 
 namespace net {
 
 namespace {
 
@@ skipping 602 matching lines @@
   }
 
   // Use the fixed testing ports if they've been provided.
   if (using_ssl_) {
     if (session_->fixed_https_port() != 0)
       port = session_->fixed_https_port();
   } else if (session_->fixed_http_port() != 0) {
     port = session_->fixed_http_port();
   }
 
+  // Check first if we have a spdy session for this group.  If so, then go
+  // straight to using that.
+  HostPortPair host_port_pair(host, port);
+  if (session_->spdy_session_pool()->HasSession(host_port_pair)) {
+    using_spdy_ = true;
+    return OK;
+  }
+
   // For a connection via HTTP proxy not using CONNECT, the connection
   // is to the proxy server only. For all other cases
   // (direct, HTTP proxy CONNECT, SOCKS), the connection is upto the
   // url endpoint. Hence we append the url data into the connection_group.
   if (proxy_mode_ != kHTTPProxy)
     connection_group.append(request_->url.GetOrigin().spec());
 
   DCHECK(!connection_group.empty());
 
-  HostResolver::RequestInfo resolve_info(host, port);
-  resolve_info.set_priority(request_->priority);
+  // If the user is refreshing the page, bypass the host cache.
+  bool disable_resolver_cache = request_->load_flags & LOAD_BYPASS_CACHE ||
+    request_->load_flags & LOAD_DISABLE_CACHE;
 
-  // The referrer is used by the DNS prefetch system to correlate resolutions
-  // with the page that triggered them. It doesn't impact the actual addresses
-  // that we resolve to.
-  resolve_info.set_referrer(request_->referrer);
+  TCPSocketParams tcp_params(host, port, request_->priority, request_->referrer,
+                             disable_resolver_cache);
 
-  // If the user is refreshing the page, bypass the host cache.
-  if (request_->load_flags & LOAD_BYPASS_CACHE ||
-      request_->load_flags & LOAD_DISABLE_CACHE) {
-    resolve_info.set_allow_cached_response(false);
-  }
-
-  HostPortPair host_port_pair(host, port);
-
-  // Check first if we have a spdy session for this group.  If so, then go
-  // straight to using that.
-  if (session_->spdy_session_pool()->HasSession(host_port_pair)) {
-    using_spdy_ = true;
-    return OK;
-  }
-
-  int rv = connection_->Init(connection_group, resolve_info, request_->priority,
+  int rv = connection_->Init(connection_group, tcp_params, request_->priority,
                              &io_callback_, session_->tcp_socket_pool(),
                              load_log_);
   return rv;
 }
 
 int HttpNetworkTransaction::DoInitConnectionComplete(int result) {
   if (result < 0) {
     UpdateConnectionTypeHistograms(CONNECTION_HTTP, false);
     return ReconsiderProxyAfterError(result);
   }
@@ skipping 1195 matching lines @@
   AuthChallengeInfo* auth_info = new AuthChallengeInfo;
   auth_info->is_proxy = target == HttpAuth::AUTH_PROXY;
   auth_info->host_and_port = ASCIIToWide(GetHostAndPort(auth_origin));
   auth_info->scheme = ASCIIToWide(auth_handler_[target]->scheme());
   // TODO(eroman): decode realm according to RFC 2047.
   auth_info->realm = ASCIIToWide(auth_handler_[target]->realm());
   response_.auth_challenge = auth_info;
 }
 
 }  // namespace net