Make a proper TCPSocketParams

net/socket/tcp_client_socket_pool.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef NET_SOCKET_TCP_CLIENT_SOCKET_POOL_H_
 #define NET_SOCKET_TCP_CLIENT_SOCKET_POOL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "net/base/host_resolver.h"
 #include "net/socket/client_socket_pool_base.h"
 #include "net/socket/client_socket_pool.h"
 
 namespace net {
 
 class ClientSocketFactory;
 
+class TCPSocketParams {
+ public:
+  TCPSocketParams(const std::string& host, int port, RequestPriority priority,
+                  const GURL& referrer, bool disable_resolver_cache)
+      :  destination_(host, port) {
+    // 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.
+    destination_.set_referrer(referrer);
+    destination_.set_priority(priority);
+    if (disable_resolver_cache)
+      destination_.set_allow_cached_response(false);
+  }
+
+  HostResolver::RequestInfo destination() const { return destination_; }
+
+ private:
+  HostResolver::RequestInfo destination_;
+};
+
 // TCPConnectJob handles the host resolution necessary for socket creation
 // and the tcp connect.
 class TCPConnectJob : public ConnectJob {
  public:
   TCPConnectJob(const std::string& group_name,
-                const HostResolver::RequestInfo& resolve_info,
+                const TCPSocketParams& params,
                 base::TimeDelta timeout_duration,
                 ClientSocketFactory* client_socket_factory,
                 HostResolver* host_resolver,
                 Delegate* delegate,
                 LoadLog* load_log);
   virtual ~TCPConnectJob();
 
   // ConnectJob methods.
   virtual LoadState GetLoadState() const;
 
@@ skipping 14 matching lines @@
   void OnIOComplete(int result);
 
   // Runs the state transition loop.
   int DoLoop(int result);
 
   int DoResolveHost();
   int DoResolveHostComplete(int result);
   int DoTCPConnect();
   int DoTCPConnectComplete(int result);
 
-  const HostResolver::RequestInfo resolve_info_;
+  const TCPSocketParams params_;
   ClientSocketFactory* const client_socket_factory_;
   CompletionCallbackImpl<TCPConnectJob> callback_;
   SingleRequestHostResolver resolver_;
   AddressList addresses_;
   State next_state_;
 
   // The time Connect() was called.
   base::TimeTicks start_time_;
 
   // The time the connect was started (after DNS finished).
@@ skipping 34 matching lines @@
 
   virtual int IdleSocketCountInGroup(const std::string& group_name) const;
 
   virtual LoadState GetLoadState(const std::string& group_name,
                                  const ClientSocketHandle* handle) const;
 
  protected:
   virtual ~TCPClientSocketPool();
 
  private:
-  typedef ClientSocketPoolBase<HostResolver::RequestInfo> PoolBase;
+  typedef ClientSocketPoolBase<TCPSocketParams> PoolBase;
 
   class TCPConnectJobFactory
       : public PoolBase::ConnectJobFactory {
    public:
     TCPConnectJobFactory(ClientSocketFactory* client_socket_factory,
                          HostResolver* host_resolver)
         : client_socket_factory_(client_socket_factory),
           host_resolver_(host_resolver) {}
 
     virtual ~TCPConnectJobFactory() {}
@@ skipping 11 matching lines @@
     const scoped_refptr<HostResolver> host_resolver_;
 
     DISALLOW_COPY_AND_ASSIGN(TCPConnectJobFactory);
   };
 
   PoolBase base_;
 
   DISALLOW_COPY_AND_ASSIGN(TCPClientSocketPool);
 };
 
-REGISTER_SOCKET_PARAMS_FOR_POOL(TCPClientSocketPool, HostResolver::RequestInfo)
+REGISTER_SOCKET_PARAMS_FOR_POOL(TCPClientSocketPool, TCPSocketParams)
 
 }  // namespace net
 
 #endif  // NET_SOCKET_TCP_CLIENT_SOCKET_POOL_H_