summaryrefslogtreecommitdiffstats
path: root/net/http/http_cache.cc
diff options
context:
space:
mode:
authordarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-11 15:40:23 +0000
committerdarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-11 15:40:23 +0000
commit928fb58bd99536f16df3739329cbade0853b3309 (patch)
tree7a6433d25d9c5303614f05b6b39cb49e60468d12 /net/http/http_cache.cc
parent6723f835ff0247e5bffad9e92d8d42a8c3ae1b3b (diff)
downloadchromium_src-928fb58bd99536f16df3739329cbade0853b3309.zip
chromium_src-928fb58bd99536f16df3739329cbade0853b3309.tar.gz
chromium_src-928fb58bd99536f16df3739329cbade0853b3309.tar.bz2
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
Diffstat (limited to 'net/http/http_cache.cc')
-rw-r--r--net/http/http_cache.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index 50e6de0..a1bee69 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -40,7 +40,6 @@
#include "net/base/net_errors.h"
#include "net/disk_cache/disk_cache.h"
#include "net/http/http_network_layer.h"
-#include "net/http/http_proxy_service.h"
#include "net/http/http_request_info.h"
#include "net/http/http_response_info.h"
#include "net/http/http_transaction.h"
@@ -940,7 +939,7 @@ void HttpCache::Transaction::OnCacheReadCompleted(int result) {
//-----------------------------------------------------------------------------
-HttpCache::HttpCache(const HttpProxyInfo* proxy_info,
+HttpCache::HttpCache(const ProxyInfo* proxy_info,
const std::wstring& cache_dir,
int cache_size)
: disk_cache_dir_(cache_dir),
@@ -951,7 +950,7 @@ HttpCache::HttpCache(const HttpProxyInfo* proxy_info,
cache_size_(cache_size) {
}
-HttpCache::HttpCache(const HttpProxyInfo* proxy_info, int cache_size)
+HttpCache::HttpCache(const ProxyInfo* proxy_info, int cache_size)
: mode_(NORMAL),
network_layer_(HttpNetworkLayer::CreateFactory(proxy_info)),
task_factory_(this),