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, 3 insertions, 3 deletions

diff --git a/net/http/http_cache.h b/net/http/http_cache.h
index 42fbfe0..5fee2e2 100644
--- a/net/http/http_cache.h
+++ b/net/http/http_cache.h
@@ -55,9 +55,9 @@ class Entry;
 
 namespace net {
 
-class HttpProxyInfo;
 class HttpRequestInfo;
 class HttpResponseInfo;
+class ProxyInfo;
 
 class HttpCache : public HttpTransactionFactory {
  public:
@@ -78,7 +78,7 @@ class HttpCache : public HttpTransactionFactory {
   // disk cache is initialized lazily (by CreateTransaction) in this case. If
   // |cache_size| is zero, a default value will be calculated automatically.
   // If the proxy information is null, then the system settings will be used.
-  HttpCache(const HttpProxyInfo* proxy_info,
+  HttpCache(const ProxyInfo* proxy_info,
             const std::wstring& cache_dir,
             int cache_size);
 
@@ -86,7 +86,7 @@ class HttpCache : public HttpTransactionFactory {
   // (by CreateTransaction) in this case. If |cache_size| is zero, a default
   // value will be calculated automatically. If the proxy information is null,
   // then the system settings will be used.
-  HttpCache(const HttpProxyInfo* proxy_info, int cache_size);
+  HttpCache(const ProxyInfo* proxy_info, int cache_size);
 
   // Initialize the cache from its component parts, which is useful for
   // testing.  The lifetime of the network_layer and disk_cache are managed by