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

net/socket/client_socket_pool_manager.h

Index: net/socket/client_socket_pool_manager.h
===================================================================
--- net/socket/client_socket_pool_manager.h	(revision 120368)
+++ net/socket/client_socket_pool_manager.h	(working copy)
@@ -1,4 +1,4 @@
-// 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.
 //
@@ -13,7 +13,6 @@
 #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;
 
@@ -27,6 +26,7 @@
 class ClientSocketHandle;
 class HostPortPair;
 class HttpNetworkSession;
+class HttpProxyClientSocketPool;
 class HttpRequestHeaders;
 class ProxyInfo;
 class TransportClientSocketPool;
@@ -88,7 +88,6 @@
     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
@@ -103,7 +102,6 @@
     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
@@ -120,8 +118,7 @@
     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
 
Property changes on: net/socket/client_socket_pool_manager.h
___________________________________________________________________
Added: svn:mergeinfo