Moved URLRequestContextGetter to net/ so it can be used by projects such as jingle.

BUG=None
TEST=Build.
Review URL: http://codereview.chromium.org/6778025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80033 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 17 insertions, 16 deletions

diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index a65a960..e1b2bb5 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -84,7 +84,6 @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/json_value_serializer.h"
-#include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/tab_proxy.h"
@@ -97,6 +96,7 @@
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_context_getter.h"
 #include "webkit/glue/password_form.h"
 
 #if defined(OS_WIN)
@@ -546,7 +546,7 @@ void AutomationProvider::SendFindRequest(
 
 class SetProxyConfigTask : public Task {
  public:
-  SetProxyConfigTask(URLRequestContextGetter* request_context_getter,
+  SetProxyConfigTask(net::URLRequestContextGetter* request_context_getter,
                      const std::string& new_proxy_config)
       : request_context_getter_(request_context_getter),
         proxy_config_(new_proxy_config) {}
@@ -601,13 +601,14 @@ class SetProxyConfigTask : public Task {
   }
 
  private:
-  scoped_refptr<URLRequestContextGetter> request_context_getter_;
+  scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
   std::string proxy_config_;
 };
 
 
 void AutomationProvider::SetProxyConfig(const std::string& new_proxy_config) {
-  URLRequestContextGetter* context_getter = Profile::GetDefaultRequestContext();
+  net::URLRequestContextGetter* context_getter =
+      Profile::GetDefaultRequestContext();
   if (!context_getter) {
     FilePath user_data_dir;
     PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc
index 57004fd..268fe44 100644
--- a/chrome/browser/automation/automation_util.cc
+++ b/chrome/browser/automation/automation_util.cc
@@ -15,7 +15,6 @@
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/browser/ui/browser.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_view_host.h"
@@ -23,12 +22,13 @@
 #include "net/base/cookie_monster.h"
 #include "net/base/cookie_store.h"
 #include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_context_getter.h"
 
 namespace {
 
 void GetCookiesOnIOThread(
     const GURL& url,
-    const scoped_refptr<URLRequestContextGetter>& context_getter,
+    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
     base::WaitableEvent* event,
     std::string* cookies) {
   *cookies =
@@ -38,7 +38,7 @@ void GetCookiesOnIOThread(
 
 void GetCanonicalCookiesOnIOThread(
     const GURL& url,
-    const scoped_refptr<URLRequestContextGetter>& context_getter,
+    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
     base::WaitableEvent* event,
     net::CookieList* cookie_list) {
   *cookie_list =
@@ -50,7 +50,7 @@ void GetCanonicalCookiesOnIOThread(
 void SetCookieOnIOThread(
     const GURL& url,
     const std::string& value,
-    const scoped_refptr<URLRequestContextGetter>& context_getter,
+    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
     base::WaitableEvent* event,
     bool* success) {
   *success =
@@ -63,7 +63,7 @@ void SetCookieWithDetailsOnIOThread(
     const GURL& url,
     const net::CookieMonster::CanonicalCookie& cookie,
     const std::string& original_domain,
-    const scoped_refptr<URLRequestContextGetter>& context_getter,
+    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
     base::WaitableEvent* event,
     bool* success) {
   net::CookieMonster* cookie_monster =
@@ -79,7 +79,7 @@ void SetCookieWithDetailsOnIOThread(
 void DeleteCookieOnIOThread(
     const GURL& url,
     const std::string& name,
-    const scoped_refptr<URLRequestContextGetter>& context_getter,
+    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
     base::WaitableEvent* event) {
   context_getter->GetURLRequestContext()->cookie_store()->
       DeleteCookie(url, name);
@@ -115,7 +115,7 @@ void GetCookies(const GURL& url,
     // Get the request context specific to the current TabContents and app.
     const Extension* installed_app = static_cast<BrowserRenderProcessHost*>(
         contents->render_view_host()->process())->installed_app();
-    scoped_refptr<URLRequestContextGetter> context_getter =
+    scoped_refptr<net::URLRequestContextGetter> context_getter =
         contents->profile()->GetRequestContextForPossibleApp(installed_app);
 
     base::WaitableEvent event(true /* manual reset */,
@@ -141,7 +141,7 @@ void SetCookie(const GURL& url,
     // Get the request context specific to the current TabContents and app.
     const Extension* installed_app = static_cast<BrowserRenderProcessHost*>(
         contents->render_view_host()->process())->installed_app();
-    scoped_refptr<URLRequestContextGetter> context_getter =
+    scoped_refptr<net::URLRequestContextGetter> context_getter =
         contents->profile()->GetRequestContextForPossibleApp(installed_app);
 
     base::WaitableEvent event(true /* manual reset */,
@@ -168,7 +168,7 @@ void DeleteCookie(const GURL& url,
     // Get the request context specific to the current TabContents and app.
     const Extension* installed_app = static_cast<BrowserRenderProcessHost*>(
         contents->render_view_host()->process())->installed_app();
-    scoped_refptr<URLRequestContextGetter> context_getter =
+    scoped_refptr<net::URLRequestContextGetter> context_getter =
         contents->profile()->GetRequestContextForPossibleApp(installed_app);
 
     base::WaitableEvent event(true /* manual reset */,
@@ -193,7 +193,7 @@ void GetCookiesJSON(AutomationProvider* provider,
   }
 
   // Since we may be on the UI thread don't call GetURLRequestContext().
-  scoped_refptr<URLRequestContextGetter> context_getter =
+  scoped_refptr<net::URLRequestContextGetter> context_getter =
       provider->profile()->GetRequestContext();
 
   net::CookieList cookie_list;
@@ -242,7 +242,7 @@ void DeleteCookieJSON(AutomationProvider* provider,
   }
 
   // Since we may be on the UI thread don't call GetURLRequestContext().
-  scoped_refptr<URLRequestContextGetter> context_getter =
+  scoped_refptr<net::URLRequestContextGetter> context_getter =
       provider->profile()->GetRequestContext();
 
   base::WaitableEvent event(true /* manual reset */,
@@ -326,7 +326,7 @@ void SetCookieJSON(AutomationProvider* provider,
   }
 
   // Since we may be on the UI thread don't call GetURLRequestContext().
-  scoped_refptr<URLRequestContextGetter> context_getter =
+  scoped_refptr<net::URLRequestContextGetter> context_getter =
       provider->profile()->GetRequestContext();
 
   base::WaitableEvent event(true /* manual reset */,