Merge 54714 - Recommit 54405 - Fix late binding induced mismatch of Socket an...

net/http/http_proxy_client_socket_pool.h

 // 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_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_
 #define NET_HTTP_HTTP_PROXY_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 "net/base/host_port_pair.h"
 #include "net/base/host_resolver.h"
 #include "net/http/http_auth.h"
 #include "net/proxy/proxy_server.h"
 #include "net/socket/client_socket_pool_base.h"
 #include "net/socket/client_socket_pool_histograms.h"
 #include "net/socket/client_socket_pool.h"
 #include "net/socket/tcp_client_socket_pool.h"
 
 namespace net {
 
 class ClientSocketFactory;
 class ConnectJobFactory;
 class HttpAuthController;
+class HttpNetworkSession;
 
 class HttpProxySocketParams : public base::RefCounted<HttpProxySocketParams> {
  public:
   HttpProxySocketParams(const scoped_refptr<TCPSocketParams>& proxy_server,
                         const GURL& request_url, HostPortPair endpoint,
-                        scoped_refptr<HttpAuthController> auth_controller,
+                        scoped_refptr<HttpNetworkSession> session,
                         bool tunnel);
 
   const scoped_refptr<TCPSocketParams>& tcp_params() const {
     return tcp_params_;
   }
   const GURL& request_url() const { return request_url_; }
   const HostPortPair& endpoint() const { return endpoint_; }
-  const scoped_refptr<HttpAuthController>& auth_controller() {
-    return auth_controller_;
+  const scoped_refptr<HttpNetworkSession>& session() {
+    return session_;
   }
   bool tunnel() const { return tunnel_; }
 
  private:
   friend class base::RefCounted<HttpProxySocketParams>;
   ~HttpProxySocketParams();
 
   const scoped_refptr<TCPSocketParams> tcp_params_;
   const GURL request_url_;
   const HostPortPair endpoint_;
-  const scoped_refptr<HttpAuthController> auth_controller_;
+  const scoped_refptr<HttpNetworkSession> session_;
   const bool tunnel_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpProxySocketParams);
 };
 
 // HttpProxyConnectJob optionally establishes a tunnel through the proxy
 // server after connecting the underlying transport socket.
 class HttpProxyConnectJob : public ConnectJob {
  public:
   HttpProxyConnectJob(const std::string& group_name,
@@ skipping 131 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(HttpProxyClientSocketPool);
 };
 
 REGISTER_SOCKET_PARAMS_FOR_POOL(HttpProxyClientSocketPool,
                                 HttpProxySocketParams);
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_