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

diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 626389b..257bbed 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -61,7 +61,7 @@
 #include "net/base/cookie_monster.h"
 #include "net/base/cookie_policy.h"
 #include "net/http/http_cache.h"
-#include "net/http/http_proxy_service.h"
+#include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "webkit/glue/webkit_glue.h"
 
@@ -91,11 +91,11 @@ URLRequestContext* Profile::GetDefaultRequestContext() {
 
 // Sets up proxy info if it was specified, otherwise returns NULL. The
 // returned pointer MUST be deleted by the caller if non-NULL.
-static net::HttpProxyInfo* CreateProxyInfo(const CommandLine& command_line) {
-  net::HttpProxyInfo* proxy_info = NULL;
+static net::ProxyInfo* CreateProxyInfo(const CommandLine& command_line) {
+  net::ProxyInfo* proxy_info = NULL;
 
   if (command_line.HasSwitch(switches::kProxyServer)) {
-    proxy_info = new net::HttpProxyInfo();
+    proxy_info = new net::ProxyInfo();
     const std::wstring& proxy_server =
         command_line.GetSwitchValue(switches::kProxyServer);
     proxy_info->UseNamedProxy(proxy_server);
@@ -136,7 +136,7 @@ class ProfileImpl::RequestContext : public URLRequestContext,
 
     CommandLine command_line;
 
-    scoped_ptr<net::HttpProxyInfo> proxy_info(CreateProxyInfo(command_line));
+    scoped_ptr<net::ProxyInfo> proxy_info(CreateProxyInfo(command_line));
     net::HttpCache* cache =
         new net::HttpCache(proxy_info.get(), disk_cache_path, 0);
 
@@ -262,7 +262,7 @@ class OffTheRecordRequestContext : public URLRequestContext,
     original_context_ = profile->GetRequestContext();
 
     CommandLine command_line;
-    scoped_ptr<net::HttpProxyInfo> proxy_info(CreateProxyInfo(command_line));
+    scoped_ptr<net::ProxyInfo> proxy_info(CreateProxyInfo(command_line));
 
     http_transaction_factory_ = new net::HttpCache(NULL, 0);
     cookie_store_ = new net::CookieMonster;