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

1 files changed, 5 insertions, 5 deletions

diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index 58cbb2f..4c430cb 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -33,7 +33,7 @@
 #include "base/ref_counted.h"
 #include "net/base/auth_cache.h"
 #include "net/base/client_socket_pool.h"
-#include "net/http/http_proxy_service.h"
+#include "net/proxy/proxy_service.h"
 
 namespace net {
 
@@ -45,7 +45,7 @@ class HttpNetworkSession : public base::RefCounted<HttpNetworkSession> {
     MAX_SOCKETS_PER_GROUP = 6
   };
   
-  HttpNetworkSession(HttpProxyResolver* proxy_resolver)
+  HttpNetworkSession(ProxyResolver* proxy_resolver)
       : connection_pool_(new ClientSocketPool(MAX_SOCKETS_PER_GROUP)),
         proxy_resolver_(proxy_resolver),
         proxy_service_(proxy_resolver) {
@@ -53,13 +53,13 @@ class HttpNetworkSession : public base::RefCounted<HttpNetworkSession> {
 
   AuthCache* auth_cache() { return &auth_cache_; }
   ClientSocketPool* connection_pool() { return connection_pool_; }
-  HttpProxyService* proxy_service() { return &proxy_service_; }
+  ProxyService* proxy_service() { return &proxy_service_; }
 
  private:
   AuthCache auth_cache_;
   scoped_refptr<ClientSocketPool> connection_pool_;
-  scoped_ptr<HttpProxyResolver> proxy_resolver_;
-  HttpProxyService proxy_service_;
+  scoped_ptr<ProxyResolver> proxy_resolver_;
+  ProxyService proxy_service_;
 };
 
 }  // namespace net