From 928fb58bd99536f16df3739329cbade0853b3309 Mon Sep 17 00:00:00 2001 From: "darin@google.com" Date: Mon, 11 Aug 2008 15:40:23 +0000 Subject: Rename HttpProxy* classes to Proxy*. Move them into a net/proxy/ subdirectory. I'm making this change because proxy resolution is really not specific to the HTTP protocol. We need to use the proxy service in our FTP implementation, for example. I made a separate directory instead of just putting these in base, because I anticipate more files once we have our own PAC implementation. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@651 0039d316-1c4b-4281-b951-d872f2087c98 --- net/http/http_network_layer.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'net/http/http_network_layer.cc') diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc index 426b987..9e13f11 100644 --- a/net/http/http_network_layer.cc +++ b/net/http/http_network_layer.cc @@ -32,9 +32,9 @@ #include "net/base/client_socket_factory.h" #include "net/http/http_network_session.h" #include "net/http/http_network_transaction.h" -#include "net/http/http_proxy_resolver_fixed.h" -#include "net/http/http_proxy_resolver_winhttp.h" #include "net/http/http_transaction_winhttp.h" +#include "net/proxy/proxy_resolver_fixed.h" +#include "net/proxy/proxy_resolver_winhttp.h" namespace net { @@ -45,7 +45,7 @@ bool HttpNetworkLayer::use_winhttp_ = true; // static HttpTransactionFactory* HttpNetworkLayer::CreateFactory( - const HttpProxyInfo* pi) { + const ProxyInfo* pi) { if (use_winhttp_) return new HttpTransactionWinHttp::Factory(pi); @@ -59,13 +59,13 @@ void HttpNetworkLayer::UseWinHttp(bool value) { //----------------------------------------------------------------------------- -HttpNetworkLayer::HttpNetworkLayer(const HttpProxyInfo* pi) +HttpNetworkLayer::HttpNetworkLayer(const ProxyInfo* pi) : suspended_(false) { - HttpProxyResolver* proxy_resolver; + ProxyResolver* proxy_resolver; if (pi) { - proxy_resolver = new HttpProxyResolverFixed(*pi); + proxy_resolver = new ProxyResolverFixed(*pi); } else { - proxy_resolver = new HttpProxyResolverWinHttp(); + proxy_resolver = new ProxyResolverWinHttp(); } session_ = new HttpNetworkSession(proxy_resolver); } -- cgit v1.1