Moved URLRequestContextGetter to net/ so it can be used by projects s…

…uch 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

chrome/browser/autofill/autofill_download.cc

@@ -178,7 +178,7 @@ void AutofillDownloadManager::SetNegativeUploadRate(double rate) {
 bool AutofillDownloadManager::StartRequest(
     const std::string& form_xml,
     const FormRequestData& request_data) {
-  URLRequestContextGetter* request_context =
+  net::URLRequestContextGetter* request_context =
       Profile::GetDefaultRequestContext();
   // Check if default request context is NULL: this very rarely happens,
   // I think, this could happen only if user opens chrome with some pages

chrome/browser/autofill/autofill_download_unittest.cc

@@ -111,7 +111,7 @@ class AutofillDownloadTestHelper : public AutofillDownloadManager::Observer {
 
   TestingProfile profile;
   AutofillDownloadManager download_manager;
-  scoped_refptr<URLRequestContextGetter> request_context_getter;
+  scoped_refptr<net::URLRequestContextGetter> request_context_getter;
 };
 
 typedef TestingBrowserProcessTest AutofillDownloadTest;

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);

chrome/browser/automation/automation_util.cc

@@ -15,20 +15,20 @@
 #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"
 #include "content/browser/tab_contents/tab_contents.h"
 #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 */,

chrome/browser/browser_process.h

@@ -41,7 +41,6 @@ class ResourceDispatcherHost;
 class SidebarManager;
 class TabCloseableStateWatcher;
 class ThumbnailGenerator;
-class URLRequestContextGetter;
 class WatchDogThread;
 
 namespace base {
@@ -55,6 +54,10 @@ class ProxyConfigServiceImpl;
 }
 #endif  // defined(OS_CHROMEOS)
 
+namespace net {
+class URLRequestContextGetter;
+}
+
 namespace printing {
 class PrintJobManager;
 class PrintPreviewTabController;
@@ -90,7 +93,7 @@ class BrowserProcess {
   virtual DevToolsManager* devtools_manager() = 0;
   virtual SidebarManager* sidebar_manager() = 0;
   virtual ui::Clipboard* clipboard() = 0;
-  virtual URLRequestContextGetter* system_request_context() = 0;
+  virtual net::URLRequestContextGetter* system_request_context() = 0;
 
 #if defined(OS_CHROMEOS)
   // Returns ChromeOS's ProxyConfigServiceImpl, creating if not yet created.

chrome/browser/browser_process_impl.cc

@@ -56,7 +56,6 @@
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/json_pref_store.h"
-#include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/switch_utils.h"
 #include "chrome/common/url_constants.h"
@@ -68,6 +67,7 @@
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/common/notification_service.h"
 #include "ipc/ipc_logging.h"
+#include "net/url_request/url_request_context_getter.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/database/database_tracker.h"
@@ -461,7 +461,7 @@ ui::Clipboard* BrowserProcessImpl::clipboard() {
   return clipboard_.get();
 }
 
-URLRequestContextGetter* BrowserProcessImpl::system_request_context() {
+net::URLRequestContextGetter* BrowserProcessImpl::system_request_context() {
   DCHECK(CalledOnValidThread());
   return io_thread()->system_url_request_context_getter();
 }

chrome/browser/browser_process_impl.h

@@ -64,7 +64,7 @@ class BrowserProcessImpl : public BrowserProcess,
   virtual DevToolsManager* devtools_manager();
   virtual SidebarManager* sidebar_manager();
   virtual ui::Clipboard* clipboard();
-  virtual URLRequestContextGetter* system_request_context();
+  virtual net::URLRequestContextGetter* system_request_context();
 #if defined(OS_CHROMEOS)
   virtual chromeos::ProxyConfigServiceImpl*
       chromeos_proxy_config_service_impl();

chrome/browser/browsing_data_appcache_helper.h

@@ -8,9 +8,9 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/task.h"
-#include "chrome/common/net/url_request_context_getter.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "googleurl/src/gurl.h"
+#include "net/url_request/url_request_context_getter.h"
 
 class Profile;
 
@@ -41,7 +41,7 @@ class BrowsingDataAppCacheHelper
   void OnFetchComplete(int rv);
   ChromeAppCacheService* GetAppCacheService();
 
-  scoped_refptr<URLRequestContextGetter> request_context_getter_;
+  scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
   bool is_fetching_;
   scoped_refptr<net::CancelableCompletionCallback<BrowsingDataAppCacheHelper> >
       appcache_info_callback_;

chrome/browser/browsing_data_remover.cc

@@ -26,7 +26,6 @@
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/webdata/web_data_service.h"
-#include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
@@ -37,6 +36,7 @@
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_context_getter.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/database/database_util.h"
 
@@ -386,7 +386,7 @@ void BrowsingDataRemover::DoClearCache(int rv) {
       case STATE_CREATE_MAIN:
       case STATE_CREATE_MEDIA: {
         // Get a pointer to the cache.
-        URLRequestContextGetter* getter =
+        net::URLRequestContextGetter* getter =
             (next_cache_state_ == STATE_CREATE_MAIN) ?
                 main_context_getter_ : media_context_getter_;
         net::HttpTransactionFactory* factory =

chrome/browser/browsing_data_remover.h

@@ -20,12 +20,15 @@ class ExtensionSpecialStoragePolicy;
 class IOThread;
 class PluginDataRemover;
 class Profile;
-class URLRequestContextGetter;
 
 namespace disk_cache {
 class Backend;
 }
 
+namespace net {
+class URLRequestContextGetter;
+}
+
 namespace webkit_database {
 class DatabaseTracker;
 }
@@ -200,8 +203,8 @@ class BrowsingDataRemover : public NotificationObserver,
   disk_cache::Backend* cache_;
 
   // Used to delete data from HTTP cache and appcache.
-  scoped_refptr<URLRequestContextGetter> main_context_getter_;
-  scoped_refptr<URLRequestContextGetter> media_context_getter_;
+  scoped_refptr<net::URLRequestContextGetter> main_context_getter_;
+  scoped_refptr<net::URLRequestContextGetter> media_context_getter_;
 
   // Used to delete plugin data.
   scoped_refptr<PluginDataRemover> plugin_data_remover_;

chrome/browser/chromeos/cros/libcros_service_library.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,12 +7,12 @@
 #include "base/synchronization/lock.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/net/url_request_context_getter.h"
 #include "content/browser/browser_thread.h"
 #include "cros/chromeos_libcros_service.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_context_getter.h"
 
 namespace chromeos {
 
@@ -208,7 +208,7 @@ void LibCrosServiceLibraryImpl::NetworkProxyLibrary::ResolveProxy(
       &NetworkProxyLibrary::NotifyProxyResolved, request);
 
   // Retrieve ProxyService from profile's request context.
-  URLRequestContextGetter* getter = Profile::GetDefaultRequestContext();
+  net::URLRequestContextGetter* getter = Profile::GetDefaultRequestContext();
   net::ProxyService* proxy_service = NULL;
   if (getter)
     proxy_service = getter->GetURLRequestContext()->proxy_service();

chrome/browser/chromeos/login/client_login_response_handler.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -11,7 +11,9 @@
 #include "base/basictypes.h"
 #include "chrome/browser/chromeos/login/auth_response_handler.h"
 
+namespace net {
 class URLRequestContextGetter;
+}
 
 namespace chromeos {
 
@@ -21,7 +23,7 @@ namespace chromeos {
 // is then sent to the IssueAuthToken endpoint.
 class ClientLoginResponseHandler : public AuthResponseHandler {
  public:
-  explicit ClientLoginResponseHandler(URLRequestContextGetter* getter)
+  explicit ClientLoginResponseHandler(net::URLRequestContextGetter* getter)
       : getter_(getter) {}
   ~ClientLoginResponseHandler() {}
 
@@ -43,7 +45,7 @@ class ClientLoginResponseHandler : public AuthResponseHandler {
   static const char kService[];
  private:
   std::string payload_;
-  URLRequestContextGetter* getter_;
+  net::URLRequestContextGetter* getter_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientLoginResponseHandler);
 };