Revert 118950 - Allow chrome to handle 407 auth challenges to CONNECT requests

net/socket/client_socket_pool_manager.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 //
 // ClientSocketPoolManager manages access to all ClientSocketPools.  It's a
 // simple container for all of them.  Most importantly, it handles the lifetime
 // and destruction order properly.
 
 #ifndef NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_H_
 #define NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_H_
 #pragma once
 
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 #include "net/base/request_priority.h"
-#include "net/http/http_proxy_client_socket_pool.h"
 
 class GURL;
 
 namespace base {
 class Value;
 }
 
 namespace net {
 
 class BoundNetLog;
 class ClientSocketHandle;
 class HostPortPair;
 class HttpNetworkSession;
+class HttpProxyClientSocketPool;
 class HttpRequestHeaders;
 class ProxyInfo;
 class TransportClientSocketPool;
 class SOCKSClientSocketPool;
 class SSLClientSocketPool;
 
 struct SSLConfig;
 
 // This should rather be a simple constant but Windows shared libs doesn't
 // really offer much flexiblity in exporting contants.
@@ skipping 41 matching lines @@
     int request_load_flags,
     RequestPriority request_priority,
     HttpNetworkSession* session,
     const ProxyInfo& proxy_info,
     bool force_spdy_over_ssl,
     bool want_spdy_over_npn,
     const SSLConfig& ssl_config_for_origin,
     const SSLConfig& ssl_config_for_proxy,
     const BoundNetLog& net_log,
     ClientSocketHandle* socket_handle,
-    TunnelAuthCallback auth_needed_callback,
     const CompletionCallback& callback);
 
 // A helper method that uses the passed in proxy information to initialize a
 // ClientSocketHandle with the relevant socket pool. Use this method for
 // a raw socket connection to a host-port pair (that needs to tunnel through
 // the proxies).
 NET_EXPORT int InitSocketHandleForRawConnect(
     const HostPortPair& host_port_pair,
     HttpNetworkSession* session,
     const ProxyInfo& proxy_info,
     const SSLConfig& ssl_config_for_origin,
     const SSLConfig& ssl_config_for_proxy,
     const BoundNetLog& net_log,
     ClientSocketHandle* socket_handle,
-    TunnelAuthCallback auth_needed_callback,
     const CompletionCallback& callback);
 
 // Similar to InitSocketHandleForHttpRequest except that it initiates the
 // desired number of preconnect streams from the relevant socket pool.
 int PreconnectSocketsForHttpRequest(
     const GURL& request_url,
     const HttpRequestHeaders& request_extra_headers,
     int request_load_flags,
     RequestPriority request_priority,
     HttpNetworkSession* session,
     const ProxyInfo& proxy_info,
     bool force_spdy_over_ssl,
     bool want_spdy_over_npn,
     const SSLConfig& ssl_config_for_origin,
     const SSLConfig& ssl_config_for_proxy,
     const BoundNetLog& net_log,
-    int num_preconnect_streams,
-    TunnelAuthCallback auth_needed_callback);
+    int num_preconnect_streams);
 
 }  // namespace net
 
 #endif  // NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_H_