Make a proper TCPSocketParams

BUG=none
TEST=existing unit tests

Review URL: http://codereview.chromium.org/661194

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40182 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 7 deletions

diff --git a/net/spdy/spdy_network_transaction.cc b/net/spdy/spdy_network_transaction.cc
index 9ae31c2b8..3d04c1d 100644
--- a/net/spdy/spdy_network_transaction.cc
+++ b/net/spdy/spdy_network_transaction.cc
@@ -17,6 +17,7 @@
 #include "net/http/http_network_session.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_info.h"
+#include "net/socket/tcp_client_socket_pool.h"
 #include "net/spdy/spdy_stream.h"
 
 using base::Time;
@@ -231,14 +232,15 @@ int SpdyNetworkTransaction::DoInitConnection() {
   std::string connection_group = "spdy.";
   connection_group.append(host);
 
-  HostResolver::RequestInfo resolve_info(host, port);
+  TCPSocketParams tcp_params(host, port, request_->priority, request_->referrer,
+                             false);
   HostPortPair host_port_pair(host, port);
 
   spdy_ = session_->spdy_session_pool()->Get(host_port_pair, session_);
   DCHECK(spdy_);
 
   return spdy_->Connect(
-      connection_group, resolve_info, request_->priority, load_log_);
+      connection_group, tcp_params, request_->priority, load_log_);
 }
 
 int SpdyNetworkTransaction::DoInitConnectionComplete(int result) {
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 172b5d7..e0eb9c5 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -257,7 +257,7 @@ void SpdySession::InitializeWithSSLSocket(ClientSocketHandle* connection) {
 }
 
 net::Error SpdySession::Connect(const std::string& group_name,
-                                const HostResolver::RequestInfo& host,
+                                const TCPSocketParams& destination,
                                 RequestPriority priority,
                                 LoadLog* load_log) {
   DCHECK(priority >= SPDY_PRIORITY_HIGHEST && priority <= SPDY_PRIORITY_LOWEST);
@@ -271,8 +271,9 @@ net::Error SpdySession::Connect(const std::string& group_name,
   static StatsCounter spdy_sessions("spdy.sessions");
   spdy_sessions.Increment();
 
-  int rv = connection_->Init(group_name, host, priority, &connect_callback_,
-                             session_->tcp_socket_pool(), load_log);
+  int rv = connection_->Init(group_name, destination, priority,
+                             &connect_callback_, session_->tcp_socket_pool(),
+                             load_log);
   DCHECK(rv <= 0);
 
   // If the connect is pending, we still return ok.  The APIs enqueue
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index 01ac1a7..2f2465b 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -20,7 +20,7 @@
 #include "net/base/upload_data_stream.h"
 #include "net/socket/client_socket.h"
 #include "net/socket/client_socket_handle.h"
-#include "testing/platform_test.h"
+#include "net/socket/tcp_client_socket_pool.h"
 #include "net/spdy/spdy_framer.h"
 #include "net/spdy/spdy_io_buffer.h"
 #include "net/spdy/spdy_protocol.h"
@@ -45,7 +45,7 @@ class SpdySession : public base::RefCounted<SpdySession>,
   // Note that this call does not wait for the connect to complete. Callers can
   // immediately start using the SpdySession while it connects.
   net::Error Connect(const std::string& group_name,
-                     const HostResolver::RequestInfo& host,
+                     const TCPSocketParams& destination,
                      RequestPriority priority,
                      LoadLog* load_log);