Change most content::URLFetcher references to net::URLFetcher

The only remaining use of content::URLFetcher is content::URLFetcher::Create.

Make content::URLFetcher not inherit from net::URLFetcher.

Also make code that directly create URLFetcherImpl instead call content::URLFetcher::Create.

BUG=118220
TEST=
TBR=mnissler@chromium.org,sky@chromium.org,mal@chromium.org,sail@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10412050

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

73 files changed, 225 insertions, 222 deletions

diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc
index 7f70be6..5ab3c46 100644
--- a/chrome/browser/alternate_nav_url_fetcher.cc
+++ b/chrome/browser/alternate_nav_url_fetcher.cc
@@ -192,7 +192,7 @@ void AlternateNavURLFetcher::StartFetch(NavigationController* controller) {
   DCHECK_EQ(NOT_STARTED, state_);
   state_ = IN_PROGRESS;
   fetcher_.reset(content::URLFetcher::Create(
-      GURL(alternate_nav_url_), content::URLFetcher::HEAD, this));
+      GURL(alternate_nav_url_), net::URLFetcher::HEAD, this));
   fetcher_->SetRequestContext(
       controller_->GetBrowserContext()->GetRequestContext());
 
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index 0b99f09..8514aab 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -535,10 +535,10 @@ net::URLFetcher* SearchProvider::CreateSuggestFetcher(
     const TemplateURLRef& suggestions_url,
     const string16& text) {
   DCHECK(suggestions_url.SupportsReplacement());
-  content::URLFetcher* fetcher = content::URLFetcher::Create(id,
+  net::URLFetcher* fetcher = content::URLFetcher::Create(id,
       GURL(suggestions_url.ReplaceSearchTerms(text,
           TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16())),
-      content::URLFetcher::GET, this);
+      net::URLFetcher::GET, this);
   fetcher->SetRequestContext(profile_->GetRequestContext());
   fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
   fetcher->Start();
diff --git a/chrome/browser/autofill/autofill_download.cc b/chrome/browser/autofill/autofill_download.cc
index 63ea072..7c96fac 100644
--- a/chrome/browser/autofill/autofill_download.cc
+++ b/chrome/browser/autofill/autofill_download.cc
@@ -171,8 +171,8 @@ bool AutofillDownloadManager::StartRequest(
 
   // Id is ignored for regular chrome, in unit test id's for fake fetcher
   // factory will be 0, 1, 2, ...
-  content::URLFetcher* fetcher = content::URLFetcher::Create(
-      fetcher_id_for_unittest_++, GURL(request_url), content::URLFetcher::POST,
+  net::URLFetcher* fetcher = content::URLFetcher::Create(
+      fetcher_id_for_unittest_++, GURL(request_url), net::URLFetcher::POST,
       this);
   url_fetchers_[fetcher] = request_data;
   fetcher->SetAutomaticallyRetryOn5xx(false);
diff --git a/chrome/browser/captive_portal/captive_portal_service.cc b/chrome/browser/captive_portal/captive_portal_service.cc
index 6f6e7c9..498cdf9 100644
--- a/chrome/browser/captive_portal/captive_portal_service.cc
+++ b/chrome/browser/captive_portal/captive_portal_service.cc
@@ -352,7 +352,7 @@ void CaptivePortalService::UpdateEnabledState() {
   }
 }
 
-// Takes a content::URLFetcher that has finished trying to retrieve the test
+// Takes a net::URLFetcher that has finished trying to retrieve the test
 // URL, and returns a CaptivePortalService::Result based on its result.
 Result CaptivePortalService::GetCaptivePortalResultFromResponse(
     const net::URLFetcher* url_fetcher,
diff --git a/chrome/browser/captive_portal/captive_portal_service.h b/chrome/browser/captive_portal/captive_portal_service.h
index eedfd31..09eab15 100644
--- a/chrome/browser/captive_portal/captive_portal_service.h
+++ b/chrome/browser/captive_portal/captive_portal_service.h
@@ -143,7 +143,7 @@ class CaptivePortalService : public ProfileKeyedService,
   //               Android, since it lacks the Browser class.
   void UpdateEnabledState();
 
-  // Takes a content::URLFetcher that has finished trying to retrieve the test
+  // Takes a net::URLFetcher that has finished trying to retrieve the test
   // URL, and returns a captive_portal::Result based on its result.
   // If the response is a 503 with a Retry-After header, |retry_after| is
   // populated accordingly.  Otherwise, it's set to base::TimeDelta().
diff --git a/chrome/browser/captive_portal/captive_portal_service_unittest.cc b/chrome/browser/captive_portal/captive_portal_service_unittest.cc
index de9953f..9cd5eb8 100644
--- a/chrome/browser/captive_portal/captive_portal_service_unittest.cc
+++ b/chrome/browser/captive_portal/captive_portal_service_unittest.cc
@@ -171,7 +171,7 @@ class CaptivePortalServiceTest : public testing::Test {
   }
 
   // Calls the corresponding CaptivePortalService function.
-  void OnURLFetchComplete(content::URLFetcher* fetcher) {
+  void OnURLFetchComplete(net::URLFetcher* fetcher) {
     service()->OnURLFetchComplete(fetcher);
   }
 
diff --git a/chrome/browser/chrome_to_mobile_service.cc b/chrome/browser/chrome_to_mobile_service.cc
index 9b1eb23..287780c 100644
--- a/chrome/browser/chrome_to_mobile_service.cc
+++ b/chrome/browser/chrome_to_mobile_service.cc
@@ -349,7 +349,7 @@ net::URLFetcher* ChromeToMobileService::CreateRequest(
   net::URLFetcher* request = content::URLFetcher::Create(
       data.type == SEARCH ? GetSearchURL(service_url) :
                             GetSubmitURL(service_url, data),
-      get ? content::URLFetcher::GET : content::URLFetcher::POST, this);
+      get ? net::URLFetcher::GET : net::URLFetcher::POST, this);
   request->SetRequestContext(profile_->GetRequestContext());
   request->SetMaxRetries(kMaxRetries);
   request->SetExtraRequestHeaders("Authorization: OAuth " +
@@ -397,7 +397,7 @@ void ChromeToMobileService::RequestAccountInfo() {
   }
 
   account_info_request_.reset(
-      content::URLFetcher::Create(url, content::URLFetcher::GET, this));
+      content::URLFetcher::Create(url, net::URLFetcher::GET, this));
   account_info_request_->SetRequestContext(profile_->GetRequestContext());
   account_info_request_->SetMaxRetries(kMaxRetries);
   // This request sends the user's cookie to check the cloud print service flag.
diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc
index b0ae177..cd7ac2e 100644
--- a/chrome/browser/chromeos/customization_document.cc
+++ b/chrome/browser/chromeos/customization_document.cc
@@ -296,7 +296,7 @@ void ServicesCustomizationDocument::ReadFileInBackground(const FilePath& file) {
 void ServicesCustomizationDocument::StartFileFetch() {
   DCHECK(url_.is_valid());
   url_fetcher_.reset(content::URLFetcher::Create(
-      url_, content::URLFetcher::GET, this));
+      url_, net::URLFetcher::GET, this));
   url_fetcher_->SetRequestContext(
       ProfileManager::GetDefaultProfile()->GetRequestContext());
   url_fetcher_->Start();
diff --git a/chrome/browser/chromeos/login/mock_url_fetchers.cc b/chrome/browser/chromeos/login/mock_url_fetchers.cc
index f0e455d..afd1973 100644
--- a/chrome/browser/chromeos/login/mock_url_fetchers.cc
+++ b/chrome/browser/chromeos/login/mock_url_fetchers.cc
@@ -23,7 +23,7 @@ ExpectCanceledFetcher::ExpectCanceledFetcher(
     bool success,
     const GURL& url,
     const std::string& results,
-    content::URLFetcher::RequestType request_type,
+    net::URLFetcher::RequestType request_type,
     net::URLFetcherDelegate* d)
     : TestURLFetcher(0, url, d),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
@@ -49,7 +49,7 @@ GotCanceledFetcher::GotCanceledFetcher(
     bool success,
     const GURL& url,
     const std::string& results,
-    content::URLFetcher::RequestType request_type,
+    net::URLFetcher::RequestType request_type,
     net::URLFetcherDelegate* d)
     : TestURLFetcher(0, url, d) {
   set_url(url);
@@ -66,7 +66,7 @@ void GotCanceledFetcher::Start() {
 SuccessFetcher::SuccessFetcher(bool success,
                                const GURL& url,
                                const std::string& results,
-                               content::URLFetcher::RequestType request_type,
+                               net::URLFetcher::RequestType request_type,
                                net::URLFetcherDelegate* d)
     : TestURLFetcher(0, url, d) {
   set_url(url);
@@ -83,7 +83,7 @@ void SuccessFetcher::Start() {
 FailFetcher::FailFetcher(bool success,
                          const GURL& url,
                          const std::string& results,
-                         content::URLFetcher::RequestType request_type,
+                         net::URLFetcher::RequestType request_type,
                          net::URLFetcherDelegate* d)
     : TestURLFetcher(0, url, d) {
   set_url(url);
@@ -110,7 +110,7 @@ const char CaptchaFetcher::kUnlockUrl[] = "http://what.ever";
 CaptchaFetcher::CaptchaFetcher(bool success,
                                const GURL& url,
                                const std::string& results,
-                               content::URLFetcher::RequestType request_type,
+                               net::URLFetcher::RequestType request_type,
                                net::URLFetcherDelegate* d)
     : TestURLFetcher(0, url, d) {
   set_url(url);
@@ -150,7 +150,7 @@ void CaptchaFetcher::Start() {
 HostedFetcher::HostedFetcher(bool success,
                              const GURL& url,
                              const std::string& results,
-                             content::URLFetcher::RequestType request_type,
+                             net::URLFetcher::RequestType request_type,
                              net::URLFetcherDelegate* d)
     : TestURLFetcher(0, url, d) {
   set_url(url);
diff --git a/chrome/browser/chromeos/login/mock_url_fetchers.h b/chrome/browser/chromeos/login/mock_url_fetchers.h
index c028a75..cb01aba 100644
--- a/chrome/browser/chromeos/login/mock_url_fetchers.h
+++ b/chrome/browser/chromeos/login/mock_url_fetchers.h
@@ -28,7 +28,7 @@ class ExpectCanceledFetcher : public TestURLFetcher {
   ExpectCanceledFetcher(bool success,
                         const GURL& url,
                         const std::string& results,
-                        content::URLFetcher::RequestType request_type,
+                        net::URLFetcher::RequestType request_type,
                         net::URLFetcherDelegate* d);
   virtual ~ExpectCanceledFetcher();
 
@@ -46,7 +46,7 @@ class GotCanceledFetcher : public TestURLFetcher {
   GotCanceledFetcher(bool success,
                      const GURL& url,
                      const std::string& results,
-                     content::URLFetcher::RequestType request_type,
+                     net::URLFetcher::RequestType request_type,
                      net::URLFetcherDelegate* d);
   virtual ~GotCanceledFetcher();
 
@@ -61,7 +61,7 @@ class SuccessFetcher : public TestURLFetcher {
   SuccessFetcher(bool success,
                  const GURL& url,
                  const std::string& results,
-                 content::URLFetcher::RequestType request_type,
+                 net::URLFetcher::RequestType request_type,
                  net::URLFetcherDelegate* d);
   virtual ~SuccessFetcher();
 
@@ -76,7 +76,7 @@ class FailFetcher : public TestURLFetcher {
   FailFetcher(bool success,
               const GURL& url,
               const std::string& results,
-              content::URLFetcher::RequestType request_type,
+              net::URLFetcher::RequestType request_type,
               net::URLFetcherDelegate* d);
   virtual ~FailFetcher();
 
@@ -91,7 +91,7 @@ class CaptchaFetcher : public TestURLFetcher {
   CaptchaFetcher(bool success,
                  const GURL& url,
                  const std::string& results,
-                 content::URLFetcher::RequestType request_type,
+                 net::URLFetcher::RequestType request_type,
                  net::URLFetcherDelegate* d);
   virtual ~CaptchaFetcher();
 
@@ -114,7 +114,7 @@ class HostedFetcher : public TestURLFetcher {
   HostedFetcher(bool success,
                 const GURL& url,
                 const std::string& results,
-                content::URLFetcher::RequestType request_type,
+                net::URLFetcher::RequestType request_type,
                 net::URLFetcherDelegate* d);
   virtual ~HostedFetcher();
 
diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc
index f1bdaa8..6e18fd5 100644
--- a/chrome/browser/component_updater/component_updater_service.cc
+++ b/chrome/browser/component_updater/component_updater_service.cc
@@ -136,7 +136,7 @@ net::URLFetcherDelegate* MakeContextDelegate(Del* delegate, Ctx* context) {
 }
 
 // Helper to start a url request using |fetcher| with the common flags.
-void StartFetch(content::URLFetcher* fetcher,
+void StartFetch(net::URLFetcher* fetcher,
                 net::URLRequestContextGetter* context_getter,
                 bool save_to_file) {
   fetcher->SetRequestContext(context_getter);
@@ -325,7 +325,7 @@ class CrxUpdateService : public ComponentUpdateService {
 
   scoped_ptr<Config> config_;
 
-  scoped_ptr<content::URLFetcher> url_fetcher_;
+  scoped_ptr<net::URLFetcher> url_fetcher_;
 
   typedef std::vector<CrxUpdateItem*> UpdateItems;
   UpdateItems work_items_;
@@ -507,7 +507,7 @@ void CrxUpdateService::ProcessPendingItems() {
     context->id = item->id;
     context->installer = item->component.installer;
     url_fetcher_.reset(content::URLFetcher::Create(
-        0, item->crx_url, content::URLFetcher::GET,
+        0, item->crx_url, net::URLFetcher::GET,
         MakeContextDelegate(this, context)));
     StartFetch(url_fetcher_.get(), config_->RequestContext(), true);
     return;
@@ -568,7 +568,7 @@ void CrxUpdateService::ProcessPendingItems() {
                                                 query,
                                                 config_->ExtraRequestParams());
   url_fetcher_.reset(content::URLFetcher::Create(
-      0, GURL(full_query), content::URLFetcher::GET,
+      0, GURL(full_query), net::URLFetcher::GET,
       MakeContextDelegate(this, new UpdateContext())));
   StartFetch(url_fetcher_.get(), config_->RequestContext(), false);
 }
diff --git a/chrome/browser/extensions/app_notify_channel_setup.cc b/chrome/browser/extensions/app_notify_channel_setup.cc
index b3921f6..e5f3cba 100644
--- a/chrome/browser/extensions/app_notify_channel_setup.cc
+++ b/chrome/browser/extensions/app_notify_channel_setup.cc
@@ -34,7 +34,7 @@
 
 using base::StringPrintf;
 using content::BrowserThread;
-using content::URLFetcher;
+using net::URLFetcher;
 
 namespace {
 
@@ -147,7 +147,7 @@ URLFetcher* AppNotifyChannelSetup::CreateURLFetcher(
   CHECK(url.is_valid());
   URLFetcher::RequestType type =
       body.empty() ? URLFetcher::GET : URLFetcher::POST;
-  URLFetcher* fetcher = URLFetcher::Create(0, url, type, this);
+  URLFetcher* fetcher = content::URLFetcher::Create(0, url, type, this);
   fetcher->SetRequestContext(profile_->GetRequestContext());
   // Always set flags to neither send nor save cookies.
   fetcher->SetLoadFlags(
diff --git a/chrome/browser/extensions/app_notify_channel_setup.h b/chrome/browser/extensions/app_notify_channel_setup.h
index cd3f5a0..ae394dd 100644
--- a/chrome/browser/extensions/app_notify_channel_setup.h
+++ b/chrome/browser/extensions/app_notify_channel_setup.h
@@ -125,7 +125,7 @@ class AppNotifyChannelSetup
   // Creates an instance of URLFetcher that does not send or save cookies.
   // The URLFether's method will be GET if body is empty, POST otherwise.
   // Caller owns the returned instance.
-  content::URLFetcher* CreateURLFetcher(
+  net::URLFetcher* CreateURLFetcher(
     const GURL& url, const std::string& body, const std::string& auth_token);
   void BeginLogin();
   void EndLogin(bool success);
@@ -158,7 +158,7 @@ class AppNotifyChannelSetup
   int return_route_id_;
   int callback_id_;
   base::WeakPtr<Delegate> delegate_;
-  scoped_ptr<content::URLFetcher> url_fetcher_;
+  scoped_ptr<net::URLFetcher> url_fetcher_;
   scoped_ptr<OAuth2AccessTokenFetcher> oauth2_fetcher_;
   scoped_ptr<AppNotifyChannelUI> ui_;
   State state_;
diff --git a/chrome/browser/extensions/apps_promo.cc b/chrome/browser/extensions/apps_promo.cc
index 70f0f64..cc4e9ac 100644
--- a/chrome/browser/extensions/apps_promo.cc
+++ b/chrome/browser/extensions/apps_promo.cc
@@ -358,7 +358,7 @@ void AppsPromoLogoFetcher::FetchLogo() {
   CHECK(promo_data_.logo.scheme() == chrome::kHttpsScheme);
 
   url_fetcher_.reset(content::URLFetcher::Create(
-      0, promo_data_.logo, content::URLFetcher::GET, this));
+      0, promo_data_.logo, net::URLFetcher::GET, this));
   url_fetcher_->SetRequestContext(
       g_browser_process->system_request_context());
   url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
diff --git a/chrome/browser/extensions/updater/extension_downloader.cc b/chrome/browser/extensions/updater/extension_downloader.cc
index 2b3a3b4..c9aca17 100644
--- a/chrome/browser/extensions/updater/extension_downloader.cc
+++ b/chrome/browser/extensions/updater/extension_downloader.cc
@@ -344,7 +344,7 @@ void ExtensionDownloader::StartUpdateCheck(ManifestFetchData* fetch_data) {
 
     current_manifest_fetch_.swap(scoped_fetch_data);
     manifest_fetcher_.reset(content::URLFetcher::Create(
-        kManifestFetcherId, fetch_data->full_url(), content::URLFetcher::GET,
+        kManifestFetcherId, fetch_data->full_url(), net::URLFetcher::GET,
         this));
     manifest_fetcher_->SetRequestContext(request_context_);
     manifest_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
@@ -556,7 +556,7 @@ void ExtensionDownloader::FetchUpdatedExtension(const std::string& id,
     }
   } else {
     extension_fetcher_.reset(content::URLFetcher::Create(
-        kExtensionFetcherId, url, content::URLFetcher::GET, this));
+        kExtensionFetcherId, url, net::URLFetcher::GET, this));
     extension_fetcher_->SetRequestContext(request_context_);
     extension_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                                      net::LOAD_DO_NOT_SAVE_COOKIES |
diff --git a/chrome/browser/extensions/webstore_inline_installer.cc b/chrome/browser/extensions/webstore_inline_installer.cc
index 2fca0f2..9155f3f 100644
--- a/chrome/browser/extensions/webstore_inline_installer.cc
+++ b/chrome/browser/extensions/webstore_inline_installer.cc
@@ -171,7 +171,7 @@ void WebstoreInlineInstaller::BeginInstall() {
   GURL webstore_data_url(extension_urls::GetWebstoreItemJsonDataURL(id_));
 
   webstore_data_url_fetcher_.reset(content::URLFetcher::Create(
-      webstore_data_url, content::URLFetcher::GET, this));
+      webstore_data_url, net::URLFetcher::GET, this));
   Profile* profile = Profile::FromBrowserContext(
       web_contents()->GetBrowserContext());
   webstore_data_url_fetcher_->SetRequestContext(
diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/browser/extensions/webstore_install_helper.cc
index a8784ef..911596f 100644
--- a/chrome/browser/extensions/webstore_install_helper.cc
+++ b/chrome/browser/extensions/webstore_install_helper.cc
@@ -59,7 +59,7 @@ void WebstoreInstallHelper::Start() {
   if (!icon_url_.is_empty()) {
     CHECK(context_getter_);
     url_fetcher_.reset(content::URLFetcher::Create(
-        icon_url_, content::URLFetcher::GET, this));
+        icon_url_, net::URLFetcher::GET, this));
     url_fetcher_->SetRequestContext(context_getter_);
     url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES |
                                net::LOAD_DO_NOT_SEND_COOKIES);
diff --git a/chrome/browser/feedback/feedback_util.cc b/chrome/browser/feedback/feedback_util.cc
index 320c5f6..a58cb22 100644
--- a/chrome/browser/feedback/feedback_util.cc
+++ b/chrome/browser/feedback/feedback_util.cc
@@ -198,8 +198,8 @@ void FeedbackUtil::SendFeedback(Profile* profile,
   else
     post_url = GURL(kFeedbackPostUrl);
 
-  content::URLFetcher* fetcher = content::URLFetcher::Create(
-      post_url, content::URLFetcher::POST,
+  net::URLFetcher* fetcher = content::URLFetcher::Create(
+      post_url, net::URLFetcher::POST,
       new FeedbackUtil::PostCleanup(profile, post_body, previous_delay));
   fetcher->SetRequestContext(profile->GetRequestContext());
   fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
diff --git a/chrome/browser/google/google_url_tracker.cc b/chrome/browser/google/google_url_tracker.cc
index 5285118..beb6bc1 100644
--- a/chrome/browser/google/google_url_tracker.cc
+++ b/chrome/browser/google/google_url_tracker.cc
@@ -283,7 +283,7 @@ void GoogleURLTracker::StartFetchIfDesirable() {
 
   already_fetched_ = true;
   fetcher_.reset(content::URLFetcher::Create(fetcher_id_, GURL(fetch_url),
-                                             content::URLFetcher::GET, this));
+                                             net::URLFetcher::GET, this));
   ++fetcher_id_;
   // We don't want this fetch to set new entries in the cache or cookies, lest
   // we alarm the user.
@@ -300,7 +300,7 @@ void GoogleURLTracker::StartFetchIfDesirable() {
 
 void GoogleURLTracker::OnURLFetchComplete(const net::URLFetcher* source) {
   // Delete the fetcher on this function's exit.
-  scoped_ptr<content::URLFetcher> clean_up_fetcher(fetcher_.release());
+  scoped_ptr<net::URLFetcher> clean_up_fetcher(fetcher_.release());
 
   // Don't update the URL if the request didn't succeed.
   if (!source->GetStatus().is_success() || (source->GetResponseCode() != 200)) {
diff --git a/chrome/browser/google/google_url_tracker.h b/chrome/browser/google/google_url_tracker.h
index b3f340d..7db816b 100644
--- a/chrome/browser/google/google_url_tracker.h
+++ b/chrome/browser/google/google_url_tracker.h
@@ -176,7 +176,7 @@ class GoogleURLTracker : public net::URLFetcherDelegate,
   GURL google_url_;
   GURL fetched_google_url_;
   base::WeakPtrFactory<GoogleURLTracker> weak_ptr_factory_;
-  scoped_ptr<content::URLFetcher> fetcher_;
+  scoped_ptr<net::URLFetcher> fetcher_;
   int fetcher_id_;
   bool in_startup_sleep_;  // True if we're in the five-second "no fetching"
                            // period that begins at browser start.
diff --git a/chrome/browser/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc
index 5c601a6..cc38da4 100644
--- a/chrome/browser/importer/toolbar_importer.cc
+++ b/chrome/browser/importer/toolbar_importer.cc
@@ -214,7 +214,7 @@ void Toolbar5Importer::GetAuthenticationFromServer() {
   // Because the importer is started as the result of a user action which
   // explicitly requires authentication, sending cookies here is reasonable.
   token_fetcher_ = content::URLFetcher::Create(
-      url, content::URLFetcher::GET, this);
+      url, net::URLFetcher::GET, this);
   token_fetcher_->SetRequestContext(request_context_getter_.get());
   token_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
   token_fetcher_->Start();
@@ -251,7 +251,7 @@ void Toolbar5Importer::GetBookmarkDataFromServer(const std::string& response) {
   // Because the importer is started as the result of a user action which
   // explicitly requires authentication, sending cookies here is reasonable.
   data_fetcher_ = content::URLFetcher::Create(
-      url, content::URLFetcher::GET, this);
+      url, net::URLFetcher::GET, this);
   data_fetcher_->SetRequestContext(request_context_getter_.get());
   data_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
   data_fetcher_->Start();
diff --git a/chrome/browser/intents/cws_intents_registry.cc b/chrome/browser/intents/cws_intents_registry.cc
index 8002d46..f6467eb 100644
--- a/chrome/browser/intents/cws_intents_registry.cc
+++ b/chrome/browser/intents/cws_intents_registry.cc
@@ -32,7 +32,7 @@ struct CWSIntentsRegistry::IntentsQuery {
   ~IntentsQuery();
 
   // Underlying URL request query.
-  scoped_ptr<content::URLFetcher> url_fetcher;
+  scoped_ptr<net::URLFetcher> url_fetcher;
 
   // The callback - invoked on completed retrieval.
   ResultsCallback callback;
@@ -142,7 +142,7 @@ void CWSIntentsRegistry::GetIntentServices(const string16& action,
   scoped_ptr<IntentsQuery> query(new IntentsQuery);
   query->callback = cb;
   query->url_fetcher.reset(content::URLFetcher::Create(
-      0, BuildQueryURL(action,mimetype), content::URLFetcher::GET, this));
+      0, BuildQueryURL(action,mimetype), net::URLFetcher::GET, this));
 
   if (query->url_fetcher.get() == NULL)
     return;
diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
index 3dcc5be..ba6465f 100644
--- a/chrome/browser/intranet_redirect_detector.cc
+++ b/chrome/browser/intranet_redirect_detector.cc
@@ -81,8 +81,8 @@ void IntranetRedirectDetector::FinishSleep() {
     for (size_t j = 0; j < kNumCharsInHostnames; ++j)
       url_string += ('a' + base::RandInt(0, 'z' - 'a'));
     GURL random_url(url_string + '/');
-    content::URLFetcher* fetcher = content::URLFetcher::Create(
-        random_url, content::URLFetcher::HEAD, this);
+    net::URLFetcher* fetcher = content::URLFetcher::Create(
+        random_url, net::URLFetcher::HEAD, this);
     // We don't want these fetches to affect existing state in the profile.
     fetcher->SetLoadFlags(net::LOAD_DISABLE_CACHE |
                           net::LOAD_DO_NOT_SAVE_COOKIES |
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index 6427496..13eea3a 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -241,7 +241,7 @@ const int kSaveStateIntervalMinutes = 5;
 // Used to indicate that the response code is currently not set at all --
 // RESPONSE_CODE_INVALID can sometimes be returned in response to a request if,
 // e.g., the server is down.
-const int kNoResponseCode = content::URLFetcher::RESPONSE_CODE_INVALID - 1;
+const int kNoResponseCode = net::URLFetcher::RESPONSE_CODE_INVALID - 1;
 
 enum ResponseStatus {
   UNKNOWN_FAILURE,
@@ -1184,7 +1184,7 @@ void MetricsService::PrepareFetchWithStagedLog() {
   // Prepare the XML version.
   DCHECK(!current_fetch_xml_.get());
   current_fetch_xml_.reset(content::URLFetcher::Create(
-      GURL(server_url_xml_), content::URLFetcher::POST, this));
+      GURL(server_url_xml_), net::URLFetcher::POST, this));
   current_fetch_xml_->SetRequestContext(
       g_browser_process->system_request_context());
   current_fetch_xml_->SetUploadData(kMimeTypeXml,
@@ -1198,7 +1198,7 @@ void MetricsService::PrepareFetchWithStagedLog() {
   DCHECK(!current_fetch_proto_.get());
   if (log_manager_.has_staged_log_proto()) {
     current_fetch_proto_.reset(content::URLFetcher::Create(
-        GURL(server_url_proto_), content::URLFetcher::POST, this));
+        GURL(server_url_proto_), net::URLFetcher::POST, this));
     current_fetch_proto_->SetRequestContext(
         g_browser_process->system_request_context());
     current_fetch_proto_->SetUploadData(kMimeTypeProto,
diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher.cc b/chrome/browser/net/gaia/gaia_oauth_fetcher.cc
index 31d55fc..f6ee49d 100644
--- a/chrome/browser/net/gaia/gaia_oauth_fetcher.cc
+++ b/chrome/browser/net/gaia/gaia_oauth_fetcher.cc
@@ -70,7 +70,7 @@ net::URLFetcher* GaiaOAuthFetcher::CreateGaiaFetcher(
   bool empty_body = body.empty();
   net::URLFetcher* result = content::URLFetcher::Create(
       0, gaia_gurl,
-      empty_body ? content::URLFetcher::GET : content::URLFetcher::POST,
+      empty_body ? net::URLFetcher::GET : net::URLFetcher::POST,
       delegate);
   result->SetRequestContext(getter);
 
diff --git a/chrome/browser/net/sdch_dictionary_fetcher.cc b/chrome/browser/net/sdch_dictionary_fetcher.cc
index 67baab0..c6a518a 100644
--- a/chrome/browser/net/sdch_dictionary_fetcher.cc
+++ b/chrome/browser/net/sdch_dictionary_fetcher.cc
@@ -67,7 +67,7 @@ void SdchDictionaryFetcher::StartFetching() {
 
   DCHECK(context_.get());
   current_fetch_.reset(content::URLFetcher::Create(
-      fetch_queue_.front(), content::URLFetcher::GET, this));
+      fetch_queue_.front(), net::URLFetcher::GET, this));
   fetch_queue_.pop();
   current_fetch_->SetRequestContext(context_.get());
   current_fetch_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
diff --git a/chrome/browser/policy/device_management_service.cc b/chrome/browser/policy/device_management_service.cc
index edaeb68..9657719 100644
--- a/chrome/browser/policy/device_management_service.cc
+++ b/chrome/browser/policy/device_management_service.cc
@@ -282,7 +282,7 @@ class DeviceManagementRequestJobImpl : public DeviceManagementRequestJob {
   GURL GetURL(const std::string& server_url);
 
   // Configures the fetcher, setting up payload and headers.
-  void ConfigureRequest(content::URLFetcher* fetcher);
+  void ConfigureRequest(net::URLFetcher* fetcher);
 
  protected:
   // DeviceManagementRequestJob:
@@ -393,7 +393,7 @@ GURL DeviceManagementRequestJobImpl::GetURL(
 }
 
 void DeviceManagementRequestJobImpl::ConfigureRequest(
-    content::URLFetcher* fetcher) {
+    net::URLFetcher* fetcher) {
   std::string payload;
   CHECK(request_.SerializeToString(&payload));
   fetcher->SetUploadData(kPostContentType, payload);
@@ -510,8 +510,8 @@ DeviceManagementService::DeviceManagementService(
 
 void DeviceManagementService::StartJob(DeviceManagementRequestJobImpl* job,
                                        bool bypass_proxy) {
-  content::URLFetcher* fetcher = content::URLFetcher::Create(
-      0, job->GetURL(server_url_), content::URLFetcher::POST, this);
+  net::URLFetcher* fetcher = content::URLFetcher::Create(
+      0, job->GetURL(server_url_), net::URLFetcher::POST, this);
   fetcher->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                         net::LOAD_DO_NOT_SAVE_COOKIES |
                         net::LOAD_DISABLE_CACHE |
diff --git a/chrome/browser/policy/testing_policy_url_fetcher_factory.cc b/chrome/browser/policy/testing_policy_url_fetcher_factory.cc
index c0f0fff..235628b 100644
--- a/chrome/browser/policy/testing_policy_url_fetcher_factory.cc
+++ b/chrome/browser/policy/testing_policy_url_fetcher_factory.cc
@@ -122,10 +122,10 @@ void TestingPolicyURLFetcherFactory::GetResponse(
   Intercept(auth_header, request_type, request, response);
 }
 
-content::URLFetcher* TestingPolicyURLFetcherFactory::CreateURLFetcher(
+net::URLFetcher* TestingPolicyURLFetcherFactory::CreateURLFetcher(
     int id,
     const GURL& url,
-    content::URLFetcher::RequestType request_type,
+    net::URLFetcher::RequestType request_type,
     net::URLFetcherDelegate* delegate) {
   return new TestingPolicyURLFetcher(
       weak_ptr_factory_.GetWeakPtr(), url, delegate);
diff --git a/chrome/browser/policy/testing_policy_url_fetcher_factory.h b/chrome/browser/policy/testing_policy_url_fetcher_factory.h
index 3ca6ef6..b2907ce 100644
--- a/chrome/browser/policy/testing_policy_url_fetcher_factory.h
+++ b/chrome/browser/policy/testing_policy_url_fetcher_factory.h
@@ -39,10 +39,10 @@ class TestingPolicyURLFetcherFactory : public content::URLFetcherFactory,
   explicit TestingPolicyURLFetcherFactory(EventLogger* logger);
   virtual ~TestingPolicyURLFetcherFactory();
 
-  virtual content::URLFetcher* CreateURLFetcher(
+  virtual net::URLFetcher* CreateURLFetcher(
       int id,
       const GURL& url,
-      content::URLFetcher::RequestType request_type,
+      net::URLFetcher::RequestType request_type,
       net::URLFetcherDelegate* delegate) OVERRIDE;
 
   LoggingWorkScheduler* scheduler();
diff --git a/chrome/browser/profiles/profile_downloader.cc b/chrome/browser/profiles/profile_downloader.cc
index cc7079f..c4d50ac 100644
--- a/chrome/browser/profiles/profile_downloader.cc
+++ b/chrome/browser/profiles/profile_downloader.cc
@@ -245,7 +245,7 @@ std::string ProfileDownloader::GetProfilePictureURL() const {
 void ProfileDownloader::StartFetchingImage() {
   VLOG(1) << "Fetching user entry with token: " << auth_token_;
   user_entry_fetcher_.reset(content::URLFetcher::Create(
-      GURL(kUserEntryURL), content::URLFetcher::GET, this));
+      GURL(kUserEntryURL), net::URLFetcher::GET, this));
   user_entry_fetcher_->SetRequestContext(
       delegate_->GetBrowserProfile()->GetRequestContext());
   user_entry_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
@@ -309,7 +309,7 @@ void ProfileDownloader::OnURLFetchComplete(const net::URLFetcher* source) {
     VLOG(1) << "Fetching profile image from " << image_url;
     picture_url_ = image_url;
     profile_image_fetcher_.reset(content::URLFetcher::Create(
-        GURL(image_url), content::URLFetcher::GET, this));
+        GURL(image_url), net::URLFetcher::GET, this));
     profile_image_fetcher_->SetRequestContext(
         delegate_->GetBrowserProfile()->GetRequestContext());
     profile_image_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
index a272443..b00682b 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
@@ -251,7 +251,7 @@ void ClientSideDetectionService::StartFetchModel() {
     // network if the model isn't in the cache.
     model_fetcher_.reset(content::URLFetcher::Create(
         0 /* ID used for testing */, GURL(kClientModelUrl),
-        content::URLFetcher::GET, this));
+        net::URLFetcher::GET, this));
     model_fetcher_->SetRequestContext(request_context_getter_.get());
     model_fetcher_->Start();
   }
@@ -302,9 +302,9 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
     return;
   }
 
-  content::URLFetcher* fetcher = content::URLFetcher::Create(
+  net::URLFetcher* fetcher = content::URLFetcher::Create(
       0 /* ID used for testing */, GURL(kClientReportPhishingUrl),
-      content::URLFetcher::POST, this);
+      net::URLFetcher::POST, this);
 
   // Remember which callback and URL correspond to the current fetcher object.
   ClientReportInfo* info = new ClientReportInfo;
diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc
index 34e2e8c..914c674 100644
--- a/chrome/browser/safe_browsing/download_protection_service.cc
+++ b/chrome/browser/safe_browsing/download_protection_service.cc
@@ -680,7 +680,7 @@ class DownloadProtectionService::CheckClientDownloadRequest
             << info_.download_url_chain.back();
     fetcher_.reset(content::URLFetcher::Create(0 /* ID used for testing */,
                                                GURL(kDownloadRequestUrl),
-                                               content::URLFetcher::POST,
+                                               net::URLFetcher::POST,
                                                this));
     fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE);
     fetcher_->SetAutomaticallyRetryOn5xx(false);  // Don't retry on error.
@@ -766,7 +766,7 @@ class DownloadProtectionService::CheckClientDownloadRequest
   scoped_refptr<SignatureUtil> signature_util_;
   scoped_refptr<SafeBrowsingService> sb_service_;
   const bool pingback_enabled_;
-  scoped_ptr<content::URLFetcher> fetcher_;
+  scoped_ptr<net::URLFetcher> fetcher_;
   bool finished_;
   ClientDownloadRequest::DownloadType type_;
   base::WeakPtrFactory<CheckClientDownloadRequest> timeout_weakptr_factory_;
diff --git a/chrome/browser/safe_browsing/malware_details_cache.cc b/chrome/browser/safe_browsing/malware_details_cache.cc
index 1914786a..fa98e81 100644
--- a/chrome/browser/safe_browsing/malware_details_cache.cc
+++ b/chrome/browser/safe_browsing/malware_details_cache.cc
@@ -83,7 +83,7 @@ void MalwareDetailsCacheCollector::OpenEntry() {
   }
 
   current_fetch_.reset(content::URLFetcher::Create(
-      GURL(resources_it_->first), content::URLFetcher::GET, this));
+      GURL(resources_it_->first), net::URLFetcher::GET, this));
   current_fetch_->SetRequestContext(request_context_getter_);
   // Only from cache, and don't save cookies.
   current_fetch_->SetLoadFlags(net::LOAD_ONLY_FROM_CACHE |
diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc
index dd53567..fcee8bf 100644
--- a/chrome/browser/safe_browsing/protocol_manager.cc
+++ b/chrome/browser/safe_browsing/protocol_manager.cc
@@ -153,8 +153,8 @@ void SafeBrowsingProtocolManager::GetFullHash(
     return;
   }
   GURL gethash_url = GetHashUrl();
-  content::URLFetcher* fetcher = content::URLFetcher::Create(
-      gethash_url, content::URLFetcher::POST, this);
+  net::URLFetcher* fetcher = content::URLFetcher::Create(
+      gethash_url, net::URLFetcher::POST, this);
   hash_requests_[fetcher] = check;
 
   std::string get_hash;
@@ -498,7 +498,7 @@ void SafeBrowsingProtocolManager::IssueChunkRequest() {
   GURL chunk_url = NextChunkUrl(next_chunk.url);
   request_type_ = CHUNK_REQUEST;
   request_.reset(content::URLFetcher::Create(
-      chunk_url, content::URLFetcher::GET, this));
+      chunk_url, net::URLFetcher::GET, this));
   request_->SetLoadFlags(net::LOAD_DISABLE_CACHE);
   request_->SetRequestContext(request_context_getter_);
   chunk_request_start_ = base::Time::Now();
@@ -539,7 +539,7 @@ void SafeBrowsingProtocolManager::OnGetChunksComplete(
 
   GURL update_url = UpdateUrl();
   request_.reset(content::URLFetcher::Create(
-      update_url, content::URLFetcher::POST, this));
+      update_url, net::URLFetcher::POST, this));
   request_->SetLoadFlags(net::LOAD_DISABLE_CACHE);
   request_->SetRequestContext(request_context_getter_);
   request_->SetUploadData("text/plain", list_data);
@@ -582,9 +582,9 @@ void SafeBrowsingProtocolManager::ReportSafeBrowsingHit(
   GURL report_url = SafeBrowsingHitUrl(malicious_url, page_url,
                                        referrer_url, is_subresource,
                                        threat_type);
-  content::URLFetcher* report = content::URLFetcher::Create(
+  net::URLFetcher* report = content::URLFetcher::Create(
       report_url,
-      post_data.empty() ? content::URLFetcher::GET : content::URLFetcher::POST,
+      post_data.empty() ? net::URLFetcher::GET : net::URLFetcher::POST,
       this);
   report->SetLoadFlags(net::LOAD_DISABLE_CACHE);
   report->SetRequestContext(request_context_getter_);
@@ -598,8 +598,8 @@ void SafeBrowsingProtocolManager::ReportSafeBrowsingHit(
 void SafeBrowsingProtocolManager::ReportMalwareDetails(
     const std::string& report) {
   GURL report_url = MalwareDetailsUrl();
-  content::URLFetcher* fetcher = content::URLFetcher::Create(
-      report_url, content::URLFetcher::POST, this);
+  net::URLFetcher* fetcher = content::URLFetcher::Create(
+      report_url, net::URLFetcher::POST, this);
   fetcher->SetLoadFlags(net::LOAD_DISABLE_CACHE);
   fetcher->SetRequestContext(request_context_getter_);
   fetcher->SetUploadData("application/octet-stream", report);
diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc
index 50eb4f7..708ea36 100644
--- a/chrome/browser/safe_browsing/safe_browsing_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_test.cc
@@ -529,7 +529,7 @@ class SafeBrowsingServiceTestHelper
   // so the caller could wait till OnURLFetchComplete is called.
   net::URLRequestStatus::Status FetchUrl(const GURL& url) {
     url_fetcher_.reset(content::URLFetcher::Create(
-        url, content::URLFetcher::GET, this));
+        url, net::URLFetcher::GET, this));
     url_fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE);
     url_fetcher_->SetRequestContext(request_context_);
     url_fetcher_->Start();
@@ -539,7 +539,7 @@ class SafeBrowsingServiceTestHelper
 
   base::OneShotTimer<SafeBrowsingServiceTestHelper> check_update_timer_;
   SafeBrowsingServiceTest* safe_browsing_test_;
-  scoped_ptr<content::URLFetcher> url_fetcher_;
+  scoped_ptr<net::URLFetcher> url_fetcher_;
   std::string response_data_;
   net::URLRequestStatus::Status response_status_;
   net::URLRequestContextGetter* request_context_;
diff --git a/chrome/browser/search_engines/template_url_fetcher.cc b/chrome/browser/search_engines/template_url_fetcher.cc
index f46d422..60b8ade 100644
--- a/chrome/browser/search_engines/template_url_fetcher.cc
+++ b/chrome/browser/search_engines/template_url_fetcher.cc
@@ -62,7 +62,7 @@ class TemplateURLFetcher::RequestDelegate
  private:
   void AddSearchProvider();
 
-  scoped_ptr<content::URLFetcher> url_fetcher_;
+  scoped_ptr<net::URLFetcher> url_fetcher_;
   TemplateURLFetcher* fetcher_;
   scoped_ptr<TemplateURL> template_url_;
   string16 keyword_;
@@ -86,7 +86,7 @@ TemplateURLFetcher::RequestDelegate::RequestDelegate(
     TemplateURLFetcherCallbacks* callbacks,
     ProviderType provider_type)
     : ALLOW_THIS_IN_INITIALIZER_LIST(url_fetcher_(content::URLFetcher::Create(
-          osdd_url, content::URLFetcher::GET, this))),
+          osdd_url, net::URLFetcher::GET, this))),
       fetcher_(fetcher),
       keyword_(keyword),
       osdd_url_(osdd_url),
diff --git a/chrome/browser/spellchecker/spellcheck_host_impl.cc b/chrome/browser/spellchecker/spellcheck_host_impl.cc
index a9c51a3..54fbf6b 100644
--- a/chrome/browser/spellchecker/spellcheck_host_impl.cc
+++ b/chrome/browser/spellchecker/spellcheck_host_impl.cc
@@ -282,7 +282,7 @@ void SpellCheckHostImpl::DownloadDictionary() {
   }
   GURL url = GURL(std::string(kDownloadServerUrl) +
                   StringToLowerASCII(bdict_file));
-  fetcher_.reset(content::URLFetcher::Create(url, content::URLFetcher::GET,
+  fetcher_.reset(content::URLFetcher::Create(url, net::URLFetcher::GET,
                                 weak_ptr_factory_.GetWeakPtr()));
   fetcher_->SetRequestContext(request_context_getter_);
   fetcher_->SetLoadFlags(
diff --git a/chrome/browser/spellchecker/spelling_service_client.cc b/chrome/browser/spellchecker/spelling_service_client.cc
index 7ca3717..63a5e1c 100644
--- a/chrome/browser/spellchecker/spelling_service_client.cc
+++ b/chrome/browser/spellchecker/spelling_service_client.cc
@@ -122,7 +122,7 @@ void SpellingServiceClient::OnURLFetchComplete(
 }
 
 net::URLFetcher* SpellingServiceClient::CreateURLFetcher(const GURL& url) {
-  return content::URLFetcher::Create(url, content::URLFetcher::POST, this);
+  return content::URLFetcher::Create(url, net::URLFetcher::POST, this);
 }
 
 bool SpellingServiceClient::ParseResponse(
diff --git a/chrome/browser/spellchecker/spelling_service_client_unittest.cc b/chrome/browser/spellchecker/spelling_service_client_unittest.cc
index 5444ab7..bd36144 100644
--- a/chrome/browser/spellchecker/spelling_service_client_unittest.cc
+++ b/chrome/browser/spellchecker/spelling_service_client_unittest.cc
@@ -131,7 +131,7 @@ class TestingSpellingServiceClient : public SpellingServiceClient {
   }
 
  private:
-  virtual content::URLFetcher* CreateURLFetcher(const GURL& url) {
+  virtual net::URLFetcher* CreateURLFetcher(const GURL& url) {
     EXPECT_EQ("https://www.googleapis.com/rpc", url.spec());
     fetcher_ = new TestSpellingURLFetcher(0, url, this,
                                           request_type_, request_text_,
diff --git a/chrome/browser/sync/glue/http_bridge.cc b/chrome/browser/sync/glue/http_bridge.cc
index d8bf723..98a81d9 100644
--- a/chrome/browser/sync/glue/http_bridge.cc
+++ b/chrome/browser/sync/glue/http_bridge.cc
@@ -222,7 +222,7 @@ void HttpBridge::MakeAsynchronousPost() {
     return;
 
   fetch_state_.url_poster = content::URLFetcher::Create(
-      url_for_request_, content::URLFetcher::POST, this);
+      url_for_request_, net::URLFetcher::POST, this);
   fetch_state_.url_poster->SetRequestContext(context_getter_for_request_);
   fetch_state_.url_poster->SetUploadData(content_type_, request_content_);
   fetch_state_.url_poster->SetExtraRequestHeaders(extra_headers_);
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index f7ea163..8c39568 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -553,8 +553,8 @@ bool SyncTest::IsTestServerRunning() {
   std::string sync_url = cl->GetSwitchValueASCII(switches::kSyncServiceURL);
   GURL sync_url_status(sync_url.append("/healthz"));
   SyncServerStatusChecker delegate;
-  scoped_ptr<content::URLFetcher> fetcher(content::URLFetcher::Create(
-    sync_url_status, content::URLFetcher::GET, &delegate));
+  scoped_ptr<net::URLFetcher> fetcher(content::URLFetcher::Create(
+    sync_url_status, net::URLFetcher::GET, &delegate));
   fetcher->SetLoadFlags(net::LOAD_DISABLE_CACHE |
                         net::LOAD_DO_NOT_SEND_COOKIES |
                         net::LOAD_DO_NOT_SAVE_COOKIES);
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index d659bb9..a8c7ea2 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -814,7 +814,7 @@ void TranslateManager::FetchLanguageListFromTranslateServer(
       kLanguageListFetchURL,
       GetLanguageCode(g_browser_process->GetApplicationLocale()).c_str());
   language_list_request_pending_.reset(content::URLFetcher::Create(
-      1, GURL(language_list_fetch_url), content::URLFetcher::GET, this));
+      1, GURL(language_list_fetch_url), net::URLFetcher::GET, this));
   language_list_request_pending_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                                                net::LOAD_DO_NOT_SAVE_COOKIES);
   language_list_request_pending_->SetRequestContext(
@@ -836,7 +836,7 @@ void TranslateManager::RequestTranslateScript() {
       kTranslateScriptURL,
       GetLanguageCode(g_browser_process->GetApplicationLocale()).c_str());
   translate_script_request_pending_.reset(content::URLFetcher::Create(
-      0, GURL(translate_script_url), content::URLFetcher::GET, this));
+      0, GURL(translate_script_url), net::URLFetcher::GET, this));
   translate_script_request_pending_->SetLoadFlags(
       net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES);
   translate_script_request_pending_->SetRequestContext(
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.cc b/chrome/browser/ui/intents/web_intent_picker_controller.cc
index 67997cd..8d4bacf 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.cc
@@ -559,10 +559,10 @@ void WebIntentPickerController::OnCWSIntentServicesAvailable(
         info.average_rating);
 
     pending_async_count_++;
-    content::URLFetcher* icon_url_fetcher = content::URLFetcher::Create(
+    net::URLFetcher* icon_url_fetcher = content::URLFetcher::Create(
         0,
         info.icon_url,
-        content::URLFetcher::GET,
+        net::URLFetcher::GET,
         new URLFetcherTrampoline(
             base::Bind(
                 &WebIntentPickerController::OnExtensionIconURLFetchComplete,
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
index f7d512c..c26f990 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
@@ -81,10 +81,10 @@ class DummyURLFetcherFactory : public content::URLFetcherFactory {
    DummyURLFetcherFactory() {}
    virtual ~DummyURLFetcherFactory() {}
 
-   virtual content::URLFetcher* CreateURLFetcher(
+   virtual net::URLFetcher* CreateURLFetcher(
        int id,
        const GURL& url,
-       content::URLFetcher::RequestType request_type,
+       net::URLFetcher::RequestType request_type,
        net::URLFetcherDelegate* d) OVERRIDE {
      return new TestURLFetcher(id, url, d);
    }
diff --git a/chrome/browser/ui/webui/ntp/suggestions_source_discovery.cc b/chrome/browser/ui/webui/ntp/suggestions_source_discovery.cc
index 85377d6..660c86d 100644
--- a/chrome/browser/ui/webui/ntp/suggestions_source_discovery.cc
+++ b/chrome/browser/ui/webui/ntp/suggestions_source_discovery.cc
@@ -68,7 +68,7 @@ void SuggestionsSourceDiscovery::FetchItems(Profile* profile) {
 
   // TODO(beaudoin): Extract the URL to some preference. Use a better service.
   recommended_fetcher_.reset(content::URLFetcher::Create(
-      GURL(kDiscoveryBackendURL), content::URLFetcher::GET, this));
+      GURL(kDiscoveryBackendURL), net::URLFetcher::GET, this));
   recommended_fetcher_->SetRequestContext(
       g_browser_process->system_request_context());
   recommended_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc
index 275aa53..8f59f48 100644
--- a/chrome/browser/web_resource/web_resource_service.cc
+++ b/chrome/browser/web_resource/web_resource_service.cc
@@ -208,7 +208,7 @@ void WebResourceService::StartFetch() {
 
   DVLOG(1) << "WebResourceService StartFetch " << web_resource_server;
   url_fetcher_.reset(content::URLFetcher::Create(
-      web_resource_server, content::URLFetcher::GET, this));
+      web_resource_server, net::URLFetcher::GET, this));
   // Do not let url fetcher affect existing state in system context
   // (by setting cookies, for example).
   url_fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE |
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher.cc b/chrome/common/net/gaia/gaia_auth_fetcher.cc
index 3dbea58..cd1eca1 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher.cc
+++ b/chrome/common/net/gaia/gaia_auth_fetcher.cc
@@ -234,7 +234,7 @@ net::URLFetcher* GaiaAuthFetcher::CreateGaiaFetcher(
     net::URLFetcherDelegate* delegate) {
   net::URLFetcher* to_return = content::URLFetcher::Create(
       0, gaia_gurl,
-      body == "" ? content::URLFetcher::GET : content::URLFetcher::POST,
+      body == "" ? net::URLFetcher::GET : net::URLFetcher::POST,
       delegate);
   to_return->SetRequestContext(getter);
   to_return->SetUploadData("application/x-www-form-urlencoded", body);
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
index e6dabaf..d557faf 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
+++ b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
@@ -84,7 +84,7 @@ static void ExpectTwoFactorChallenge(const GoogleServiceAuthError& error) {
 MockFetcher::MockFetcher(bool success,
                          const GURL& url,
                          const std::string& results,
-                         content::URLFetcher::RequestType request_type,
+                         net::URLFetcher::RequestType request_type,
                          net::URLFetcherDelegate* d)
     : TestURLFetcher(0, url, d) {
   set_url(url);
@@ -107,7 +107,7 @@ MockFetcher::MockFetcher(const GURL& url,
                          int response_code,
                          const net::ResponseCookies& cookies,
                          const std::string& results,
-                         content::URLFetcher::RequestType request_type,
+                         net::URLFetcher::RequestType request_type,
                          net::URLFetcherDelegate* d)
     : TestURLFetcher(0, url, d) {
   set_url(url);
@@ -264,7 +264,7 @@ TEST_F(GaiaAuthFetcherTest, LoginNetFailure) {
 
   MockFetcher mock_fetcher(
       client_login_source_, status, 0, net::ResponseCookies(), std::string(),
-      content::URLFetcher::GET, &auth);
+      net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }
 
@@ -284,7 +284,7 @@ TEST_F(GaiaAuthFetcherTest, TokenNetFailure) {
 
   MockFetcher mock_fetcher(
       issue_auth_token_source_, status, 0, cookies_, std::string(),
-      content::URLFetcher::GET, &auth);
+      net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }
 
@@ -305,7 +305,7 @@ TEST_F(GaiaAuthFetcherTest, LoginDenied) {
 
   MockFetcher mock_fetcher(
       client_login_source_, status, net::HTTP_FORBIDDEN, cookies_, data,
-      content::URLFetcher::GET, &auth);
+      net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }
 
@@ -353,7 +353,7 @@ TEST_F(GaiaAuthFetcherTest, OnlineLogin) {
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   MockFetcher mock_fetcher(
       client_login_source_, status, net::HTTP_OK, cookies_, data,
-      content::URLFetcher::GET, &auth);
+      net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }
 
@@ -367,7 +367,7 @@ TEST_F(GaiaAuthFetcherTest, WorkingIssueAuthToken) {
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   MockFetcher mock_fetcher(
       issue_auth_token_source_, status, net::HTTP_OK, cookies_, "token",
-      content::URLFetcher::GET, &auth);
+      net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }
 
@@ -399,7 +399,7 @@ TEST_F(GaiaAuthFetcherTest, TwoFactorLogin) {
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   MockFetcher mock_fetcher(
       client_login_source_, status, net::HTTP_FORBIDDEN, cookies_, response,
-      content::URLFetcher::GET, &auth);
+      net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }
 
@@ -550,7 +550,7 @@ TEST_F(GaiaAuthFetcherTest, ClientFetchPending) {
       client_login_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
       net::HTTP_OK, cookies_, "SID=sid\nLSID=lsid\nAuth=auth\n",
-      content::URLFetcher::GET, &auth);
+      net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
@@ -570,7 +570,7 @@ TEST_F(GaiaAuthFetcherTest, FullTokenSuccess) {
       issue_auth_token_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
       net::HTTP_OK, cookies_, "token",
-      content::URLFetcher::GET, &auth);
+      net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
@@ -590,7 +590,7 @@ TEST_F(GaiaAuthFetcherTest, FullTokenFailure) {
   MockFetcher mock_fetcher(
       issue_auth_token_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
-      net::HTTP_FORBIDDEN, cookies_, "", content::URLFetcher::GET, &auth);
+      net::HTTP_FORBIDDEN, cookies_, "", net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
@@ -616,14 +616,14 @@ TEST_F(GaiaAuthFetcherTest, OAuthLoginTokenSuccess) {
       client_login_to_oauth2_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
       net::HTTP_OK, cookies, "",
-      content::URLFetcher::POST, &auth);
+      net::URLFetcher::POST, &auth);
   auth.OnURLFetchComplete(&mock_fetcher1);
   EXPECT_TRUE(auth.HasPendingFetch());
   MockFetcher mock_fetcher2(
       oauth2_token_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
       net::HTTP_OK, cookies_, kGetTokenPairValidResponse,
-      content::URLFetcher::POST, &auth);
+      net::URLFetcher::POST, &auth);
   auth.OnURLFetchComplete(&mock_fetcher2);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
@@ -655,7 +655,7 @@ TEST_F(GaiaAuthFetcherTest, OAuthLoginTokenClientLoginToOAuth2Failure) {
       client_login_to_oauth2_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
       net::HTTP_FORBIDDEN, cookies, "",
-      content::URLFetcher::POST, &auth);
+      net::URLFetcher::POST, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
@@ -677,14 +677,14 @@ TEST_F(GaiaAuthFetcherTest, OAuthLoginTokenOAuth2TokenPairFailure) {
       client_login_to_oauth2_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
       net::HTTP_OK, cookies, "",
-      content::URLFetcher::POST, &auth);
+      net::URLFetcher::POST, &auth);
   auth.OnURLFetchComplete(&mock_fetcher1);
   EXPECT_TRUE(auth.HasPendingFetch());
   MockFetcher mock_fetcher2(
       oauth2_token_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
       net::HTTP_FORBIDDEN, cookies_, "",
-      content::URLFetcher::POST, &auth);
+      net::URLFetcher::POST, &auth);
   auth.OnURLFetchComplete(&mock_fetcher2);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
@@ -705,7 +705,7 @@ TEST_F(GaiaAuthFetcherTest, TokenAuthSuccess) {
   MockFetcher mock_fetcher(
       token_auth_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
-      net::HTTP_OK, cookies_, "<html></html>", content::URLFetcher::GET,
+      net::HTTP_OK, cookies_, "<html></html>", net::URLFetcher::GET,
       &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
   EXPECT_FALSE(auth.HasPendingFetch());
@@ -726,7 +726,7 @@ TEST_F(GaiaAuthFetcherTest, TokenAuthUnauthorizedFailure) {
   MockFetcher mock_fetcher(
       token_auth_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
-      net::HTTP_UNAUTHORIZED, cookies_, "", content::URLFetcher::GET, &auth);
+      net::HTTP_UNAUTHORIZED, cookies_, "", net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
@@ -746,7 +746,7 @@ TEST_F(GaiaAuthFetcherTest, TokenAuthNetFailure) {
   MockFetcher mock_fetcher(
       token_auth_source_,
       net::URLRequestStatus(net::URLRequestStatus::FAILED, 0),
-      net::HTTP_OK, cookies_, "", content::URLFetcher::GET, &auth);
+      net::HTTP_OK, cookies_, "", net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
@@ -766,7 +766,7 @@ TEST_F(GaiaAuthFetcherTest, MergeSessionSuccess) {
   MockFetcher mock_fetcher(
       merge_session_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
-      net::HTTP_OK, cookies_, "<html></html>", content::URLFetcher::GET,
+      net::HTTP_OK, cookies_, "<html></html>", net::URLFetcher::GET,
       &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
   EXPECT_FALSE(auth.HasPendingFetch());
@@ -817,7 +817,7 @@ TEST_F(GaiaAuthFetcherTest, UberAuthTokenSuccess) {
   MockFetcher mock_fetcher(
       uberauth_token_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
-      net::HTTP_OK, cookies_, "uberToken", content::URLFetcher::POST,
+      net::HTTP_OK, cookies_, "uberToken", net::URLFetcher::POST,
       &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
   EXPECT_FALSE(auth.HasPendingFetch());
@@ -1029,6 +1029,6 @@ TEST_F(GaiaAuthFetcherTest, StartOAuthLogin) {
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   MockFetcher mock_fetcher(
       oauth_login_gurl_, status, net::HTTP_OK, cookies_, data,
-      content::URLFetcher::GET, &auth);
+      net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }
diff --git a/chrome/common/net/gaia/gaia_oauth_client.cc b/chrome/common/net/gaia/gaia_oauth_client.cc
index cd10967..6705597 100644
--- a/chrome/common/net/gaia/gaia_oauth_client.cc
+++ b/chrome/common/net/gaia/gaia_oauth_client.cc
@@ -60,7 +60,7 @@ class GaiaOAuthClient::Core
   int num_retries_;
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
   GaiaOAuthClient::Delegate* delegate_;
-  scoped_ptr<content::URLFetcher> request_;
+  scoped_ptr<net::URLFetcher> request_;
 };
 
 void GaiaOAuthClient::Core::GetTokensFromAuthCode(
@@ -101,7 +101,7 @@ void GaiaOAuthClient::Core::MakeGaiaRequest(
   delegate_ = delegate;
   num_retries_ = 0;
   request_.reset(content::URLFetcher::Create(
-      0, gaia_url_, content::URLFetcher::POST, this));
+      0, gaia_url_, net::URLFetcher::POST, this));
   request_->SetRequestContext(request_context_getter_);
   request_->SetUploadData("application/x-www-form-urlencoded", post_body);
   request_->SetMaxRetries(max_retries);
diff --git a/chrome/common/net/gaia/gaia_oauth_client_unittest.cc b/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
index ef9defc..885589ec 100644
--- a/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
+++ b/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
@@ -30,7 +30,7 @@ class MockOAuthFetcher : public TestURLFetcher {
                    int max_failure_count,
                    const GURL& url,
                    const std::string& results,
-                   content::URLFetcher::RequestType request_type,
+                   net::URLFetcher::RequestType request_type,
                    net::URLFetcherDelegate* d)
     : TestURLFetcher(0, url, d),
       max_failure_count_(max_failure_count),
@@ -72,10 +72,10 @@ class MockOAuthFetcherFactory : public content::URLFetcherFactory,
         response_code_(net::HTTP_OK) {
   }
   ~MockOAuthFetcherFactory() {}
-  virtual content::URLFetcher* CreateURLFetcher(
+  virtual net::URLFetcher* CreateURLFetcher(
       int id,
       const GURL& url,
-      content::URLFetcher::RequestType request_type,
+      net::URLFetcher::RequestType request_type,
       net::URLFetcherDelegate* d) {
     return new MockOAuthFetcher(
         response_code_,
diff --git a/chrome/common/net/gaia/mock_url_fetcher_factory.h b/chrome/common/net/gaia/mock_url_fetcher_factory.h
index f1bc80c..ec403f5 100644
--- a/chrome/common/net/gaia/mock_url_fetcher_factory.h
+++ b/chrome/common/net/gaia/mock_url_fetcher_factory.h
@@ -21,7 +21,7 @@ class MockFetcher : public TestURLFetcher {
   MockFetcher(bool success,
               const GURL& url,
               const std::string& results,
-              content::URLFetcher::RequestType request_type,
+              net::URLFetcher::RequestType request_type,
               net::URLFetcherDelegate* d);
 
   MockFetcher(const GURL& url,
@@ -29,7 +29,7 @@ class MockFetcher : public TestURLFetcher {
               int response_code,
               const net::ResponseCookies& cookies,
               const std::string& results,
-              content::URLFetcher::RequestType request_type,
+              net::URLFetcher::RequestType request_type,
               net::URLFetcherDelegate* d);
 
   virtual ~MockFetcher();
@@ -49,10 +49,10 @@ class MockURLFetcherFactory : public content::URLFetcherFactory,
         success_(true) {
   }
   ~MockURLFetcherFactory() {}
-  content::URLFetcher* CreateURLFetcher(
+  net::URLFetcher* CreateURLFetcher(
       int id,
       const GURL& url,
-      content::URLFetcher::RequestType request_type,
+      net::URLFetcher::RequestType request_type,
       net::URLFetcherDelegate* d) OVERRIDE {
     return new T(success_, url, results_, request_type, d);
   }
diff --git a/chrome/common/net/gaia/oauth2_access_token_fetcher_unittest.cc b/chrome/common/net/gaia/oauth2_access_token_fetcher_unittest.cc
index 20696cd..585a9aa 100644
--- a/chrome/common/net/gaia/oauth2_access_token_fetcher_unittest.cc
+++ b/chrome/common/net/gaia/oauth2_access_token_fetcher_unittest.cc
@@ -60,10 +60,10 @@ public:
 
   MOCK_METHOD4(
       CreateURLFetcher,
-      content::URLFetcher* (int id,
-                            const GURL& url,
-                            URLFetcher::RequestType request_type,
-                            URLFetcherDelegate* d));
+      URLFetcher* (int id,
+                   const GURL& url,
+                   URLFetcher::RequestType request_type,
+                   URLFetcherDelegate* d));
 };
 
 class MockOAuth2AccessTokenConsumer : public OAuth2AccessTokenConsumer {
diff --git a/chrome/common/net/gaia/oauth2_api_call_flow_unittest.cc b/chrome/common/net/gaia/oauth2_api_call_flow_unittest.cc
index b36b185..f246558 100644
--- a/chrome/common/net/gaia/oauth2_api_call_flow_unittest.cc
+++ b/chrome/common/net/gaia/oauth2_api_call_flow_unittest.cc
@@ -60,10 +60,10 @@ class MockUrlFetcherFactory : public ScopedURLFetcherFactory,
 
   MOCK_METHOD4(
       CreateURLFetcher,
-      content::URLFetcher* (int id,
-                            const GURL& url,
-                            URLFetcher::RequestType request_type,
-                            URLFetcherDelegate* d));
+      URLFetcher* (int id,
+                   const GURL& url,
+                   URLFetcher::RequestType request_type,
+                   URLFetcherDelegate* d));
 };
 
 class MockAccessTokenFetcher : public OAuth2AccessTokenFetcher {
@@ -92,9 +92,9 @@ class MockApiCallFlow : public OAuth2ApiCallFlow {
   MOCK_METHOD0(CreateApiCallUrl, GURL ());
   MOCK_METHOD0(CreateApiCallBody, std::string ());
   MOCK_METHOD1(ProcessApiCallSuccess,
-      void (const net::URLFetcher* source));
+      void (const URLFetcher* source));
   MOCK_METHOD1(ProcessApiCallFailure,
-      void (const net::URLFetcher* source));
+      void (const URLFetcher* source));
   MOCK_METHOD1(ProcessNewAccessToken,
       void (const std::string& access_token));
   MOCK_METHOD1(ProcessMintAccessTokenFailure,
diff --git a/chrome/common/net/gaia/oauth2_mint_token_fetcher_unittest.cc b/chrome/common/net/gaia/oauth2_mint_token_fetcher_unittest.cc
index 4c079a9..cfc3c1e 100644
--- a/chrome/common/net/gaia/oauth2_mint_token_fetcher_unittest.cc
+++ b/chrome/common/net/gaia/oauth2_mint_token_fetcher_unittest.cc
@@ -57,10 +57,10 @@ public:
 
   MOCK_METHOD4(
       CreateURLFetcher,
-      content::URLFetcher* (int id,
-                            const GURL& url,
-                            URLFetcher::RequestType request_type,
-                            URLFetcherDelegate* d));
+      URLFetcher* (int id,
+                   const GURL& url,
+                   URLFetcher::RequestType request_type,
+                   URLFetcherDelegate* d));
 };
 
 class MockOAuth2MintTokenConsumer : public OAuth2MintTokenConsumer {
diff --git a/chrome/common/net/gaia/oauth2_mint_token_flow.cc b/chrome/common/net/gaia/oauth2_mint_token_flow.cc
index e2010e8..17438aa 100644
--- a/chrome/common/net/gaia/oauth2_mint_token_flow.cc
+++ b/chrome/common/net/gaia/oauth2_mint_token_flow.cc
@@ -23,7 +23,7 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
-using content::URLFetcher;
+using net::URLFetcher;
 using net::URLRequestContextGetter;
 using net::URLRequestStatus;
 
diff --git a/chrome/common/net/gaia/oauth2_mint_token_flow_unittest.cc b/chrome/common/net/gaia/oauth2_mint_token_flow_unittest.cc
index b79edbd..e113399 100644
--- a/chrome/common/net/gaia/oauth2_mint_token_flow_unittest.cc
+++ b/chrome/common/net/gaia/oauth2_mint_token_flow_unittest.cc
@@ -17,7 +17,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using content::URLFetcher;
+using net::URLFetcher;
 using net::URLRequestStatus;
 using testing::_;
 using testing::StrictMock;
diff --git a/chrome/common/net/gaia/oauth2_revocation_fetcher_unittest.cc b/chrome/common/net/gaia/oauth2_revocation_fetcher_unittest.cc
index 3e50f54..0f64092 100644
--- a/chrome/common/net/gaia/oauth2_revocation_fetcher_unittest.cc
+++ b/chrome/common/net/gaia/oauth2_revocation_fetcher_unittest.cc
@@ -26,7 +26,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
-using content::URLFetcher;
+using net::URLFetcher;
 using net::URLFetcherDelegate;
 using content::URLFetcherFactory;
 using net::ResponseCookies;
diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.cc b/chrome/service/cloud_print/cloud_print_url_fetcher.cc
index 3a8990a..4b9dff6 100644
--- a/chrome/service/cloud_print/cloud_print_url_fetcher.cc
+++ b/chrome/service/cloud_print/cloud_print_url_fetcher.cc
@@ -12,6 +12,7 @@
 #include "chrome/service/cloud_print/cloud_print_token_store.h"
 #include "chrome/service/net/service_url_request_context.h"
 #include "chrome/service/service_process.h"
+#include "content/public/common/url_fetcher.h"
 #include "googleurl/src/gurl.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_request_status.h"
@@ -31,7 +32,7 @@ void CloudPrintURLFetcher::StartGetRequest(
     int max_retries,
     const std::string& additional_headers) {
   StartRequestHelper(url,
-                     content::URLFetcher::GET,
+                     net::URLFetcher::GET,
                      delegate,
                      max_retries,
                      std::string(),
@@ -47,7 +48,7 @@ void CloudPrintURLFetcher::StartPostRequest(
     const std::string& post_data,
     const std::string& additional_headers) {
   StartRequestHelper(url,
-                     content::URLFetcher::POST,
+                     net::URLFetcher::POST,
                      delegate,
                      max_retries,
                      post_data_mime_type,
@@ -133,7 +134,7 @@ void CloudPrintURLFetcher::OnURLFetchComplete(
 
 void CloudPrintURLFetcher::StartRequestHelper(
     const GURL& url,
-    content::URLFetcher::RequestType request_type,
+    net::URLFetcher::RequestType request_type,
     Delegate* delegate,
     int max_retries,
     const std::string& post_data_mime_type,
@@ -149,7 +150,7 @@ void CloudPrintURLFetcher::StartRequestHelper(
   request_->SetMaxRetries(max_retries);
   delegate_ = delegate;
   SetupRequestHeaders();
-  if (request_type == content::URLFetcher::POST) {
+  if (request_type == net::URLFetcher::POST) {
     request_->SetUploadData(post_data_mime_type, post_data);
   }
 
diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.h b/chrome/service/cloud_print/cloud_print_url_fetcher.h
index 92b988d..654b4e7 100644
--- a/chrome/service/cloud_print/cloud_print_url_fetcher.h
+++ b/chrome/service/cloud_print/cloud_print_url_fetcher.h
@@ -10,7 +10,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "content/public/common/url_fetcher.h"
+#include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 class GURL;
@@ -118,7 +118,7 @@ class CloudPrintURLFetcher
 
  private:
   void StartRequestHelper(const GURL& url,
-                          content::URLFetcher::RequestType request_type,
+                          net::URLFetcher::RequestType request_type,
                           Delegate* delegate,
                           int max_retries,
                           const std::string& post_data_mime_type,
@@ -126,10 +126,10 @@ class CloudPrintURLFetcher
                           const std::string& additional_headers);
   void SetupRequestHeaders();
 
-  scoped_ptr<content::URLFetcher> request_;
+  scoped_ptr<net::URLFetcher> request_;
   Delegate* delegate_;
   int num_retries_;
-  content::URLFetcher::RequestType request_type_;
+  net::URLFetcher::RequestType request_type_;
   std::string additional_headers_;
   std::string post_data_mime_type_;
   std::string post_data_;
diff --git a/chrome/service/gaia/service_gaia_authenticator.cc b/chrome/service/gaia/service_gaia_authenticator.cc
index a7a2da3..8f0bb7e 100644
--- a/chrome/service/gaia/service_gaia_authenticator.cc
+++ b/chrome/service/gaia/service_gaia_authenticator.cc
@@ -78,8 +78,8 @@ ServiceGaiaAuthenticator::~ServiceGaiaAuthenticator() {}
 void ServiceGaiaAuthenticator::DoPost(const GURL& post_url,
                                       const std::string& post_body) {
   DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
-  content::URLFetcher* request = content::URLFetcher::Create(
-      post_url, content::URLFetcher::POST, this);
+  net::URLFetcher* request = content::URLFetcher::Create(
+      post_url, net::URLFetcher::POST, this);
   request->SetRequestContext(
       g_service_process->GetServiceURLRequestContextGetter());
   request->SetUploadData("application/x-www-form-urlencoded", post_body);
diff --git a/content/browser/geolocation/network_location_request.cc b/content/browser/geolocation/network_location_request.cc
index 71eb08f..300df7b 100644
--- a/content/browser/geolocation/network_location_request.cc
+++ b/content/browser/geolocation/network_location_request.cc
@@ -12,8 +12,8 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "content/common/net/url_fetcher_impl.h"
 #include "content/public/common/geoposition.h"
+#include "content/public/common/url_fetcher.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_context_getter.h"
@@ -87,8 +87,8 @@ bool NetworkLocationRequest::MakeRequest(const string16& access_token,
 
   GURL request_url = FormRequestURL(url_.spec(), access_token,
                                     wifi_data, timestamp_);
-  url_fetcher_.reset(URLFetcherImpl::Create(
-      url_fetcher_id_for_tests, request_url, URLFetcherImpl::GET, this));
+  url_fetcher_.reset(content::URLFetcher::Create(
+      url_fetcher_id_for_tests, request_url, net::URLFetcher::GET, this));
   url_fetcher_->SetRequestContext(url_context_);
   url_fetcher_->SetLoadFlags(
       net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE |
diff --git a/content/browser/geolocation/network_location_request.h b/content/browser/geolocation/network_location_request.h
index b13c626..1f12285 100644
--- a/content/browser/geolocation/network_location_request.h
+++ b/content/browser/geolocation/network_location_request.h
@@ -16,10 +16,10 @@
 
 namespace content {
 struct Geoposition;
-class URLFetcher;
 }
 
 namespace net {
+class URLFetcher;
 class URLRequestContextGetter;
 }
 
@@ -68,7 +68,7 @@ class NetworkLocationRequest : private net::URLFetcherDelegate {
   scoped_refptr<net::URLRequestContextGetter> url_context_;
   ListenerInterface* listener_;
   const GURL url_;
-  scoped_ptr<content::URLFetcher> url_fetcher_;
+  scoped_ptr<net::URLFetcher> url_fetcher_;
 
   // Keep a copy of the data sent in the request, so we can refer back to it
   // when the response arrives.
diff --git a/content/browser/speech/google_one_shot_remote_engine.cc b/content/browser/speech/google_one_shot_remote_engine.cc
index 7d7b237..6deec30 100644
--- a/content/browser/speech/google_one_shot_remote_engine.cc
+++ b/content/browser/speech/google_one_shot_remote_engine.cc
@@ -11,9 +11,9 @@
 #include "base/string_util.h"
 #include "base/values.h"
 #include "content/browser/speech/audio_buffer.h"
-#include "content/common/net/url_fetcher_impl.h"
 #include "content/public/common/speech_recognition_error.h"
 #include "content/public/common/speech_recognition_result.h"
+#include "content/public/common/url_fetcher.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_context.h"
@@ -207,10 +207,10 @@ void GoogleOneShotRemoteEngine::StartRecognition() {
                                       config_.audio_sample_rate,
                                       config_.audio_num_bits_per_sample));
   DCHECK(encoder_.get());
-  url_fetcher_.reset(URLFetcherImpl::Create(url_fetcher_id_for_tests,
-                                            url,
-                                            URLFetcherImpl::POST,
-                                            this));
+  url_fetcher_.reset(content::URLFetcher::Create(url_fetcher_id_for_tests,
+                                                 url,
+                                                 net::URLFetcher::POST,
+                                                 this));
   url_fetcher_->SetChunkedUpload(encoder_->mime_type());
   url_fetcher_->SetRequestContext(url_context_);
   url_fetcher_->SetReferrer(config_.origin_url);
diff --git a/content/browser/speech/google_one_shot_remote_engine.h b/content/browser/speech/google_one_shot_remote_engine.h
index 09dd1e4..9d1301f 100644
--- a/content/browser/speech/google_one_shot_remote_engine.h
+++ b/content/browser/speech/google_one_shot_remote_engine.h
@@ -58,7 +58,7 @@ class CONTENT_EXPORT GoogleOneShotRemoteEngine
 
  private:
   SpeechRecognitionEngineConfig config_;
-  scoped_ptr<content::URLFetcher> url_fetcher_;
+  scoped_ptr<net::URLFetcher> url_fetcher_;
   scoped_refptr<net::URLRequestContextGetter> url_context_;
   scoped_ptr<AudioEncoder> encoder_;
 
diff --git a/content/common/net/url_fetcher_core.cc b/content/common/net/url_fetcher_core.cc
index a9ea391..e2f9452 100644
--- a/content/common/net/url_fetcher_core.cc
+++ b/content/common/net/url_fetcher_core.cc
@@ -242,9 +242,9 @@ void URLFetcherCore::FileWriter::RemoveFile() {
 
 static bool g_interception_enabled = false;
 
-URLFetcherCore::URLFetcherCore(URLFetcher* fetcher,
+URLFetcherCore::URLFetcherCore(net::URLFetcher* fetcher,
                                const GURL& original_url,
-                               URLFetcher::RequestType request_type,
+                               net::URLFetcher::RequestType request_type,
                                net::URLFetcherDelegate* d)
     : fetcher_(fetcher),
       original_url_(original_url),
@@ -254,7 +254,7 @@ URLFetcherCore::URLFetcherCore(URLFetcher* fetcher,
           base::MessageLoopProxy::current()),
       request_(NULL),
       load_flags_(net::LOAD_NORMAL),
-      response_code_(URLFetcher::RESPONSE_CODE_INVALID),
+      response_code_(net::URLFetcher::RESPONSE_CODE_INVALID),
       buffer_(new net::IOBuffer(kBufferSize)),
       url_request_data_key_(NULL),
       was_fetched_via_proxy_(false),
@@ -407,7 +407,7 @@ void URLFetcherCore::SetFirstPartyForCookies(
 
 void URLFetcherCore::SetURLRequestUserData(
     const void* key,
-    const URLFetcher::CreateDataCallback& create_data_callback) {
+    const net::URLFetcher::CreateDataCallback& create_data_callback) {
   DCHECK(key);
   DCHECK(!create_data_callback.is_null());
   url_request_data_key_ = key;
@@ -638,7 +638,7 @@ void URLFetcherCore::OnReadCompleted(net::URLRequest* request,
 
   // See comments re: HEAD requests in ReadResponse().
   if ((!status.is_io_pending() && !waiting_on_write) ||
-      (request_type_ == URLFetcher::HEAD)) {
+      (request_type_ == net::URLFetcher::HEAD)) {
     status_ = status;
     ReleaseRequest();
 
@@ -701,7 +701,8 @@ void URLFetcherCore::ReadResponse() {
   // completed immediately, without trying to read any data back (all we care
   // about is the response code and headers, which we already have).
   int bytes_read = 0;
-  if (request_->status().is_success() && (request_type_ != URLFetcher::HEAD))
+  if (request_->status().is_success() &&
+      (request_type_ != net::URLFetcher::HEAD))
     request_->Read(buffer_, kBufferSize, &bytes_read);
   OnReadCompleted(request_.get(), bytes_read);
 }
@@ -743,15 +744,16 @@ void URLFetcherCore::StartURLRequest() {
   }
 
   switch (request_type_) {
-    case URLFetcher::GET:
+    case net::URLFetcher::GET:
       break;
 
-    case URLFetcher::POST:
-    case URLFetcher::PUT:
+    case net::URLFetcher::POST:
+    case net::URLFetcher::PUT:
       DCHECK(!upload_content_.empty() || is_chunked_upload_);
       DCHECK(!upload_content_type_.empty());
 
-      request_->set_method(request_type_ == URLFetcher::POST ? "POST" : "PUT");
+      request_->set_method(
+          request_type_ == net::URLFetcher::POST ? "POST" : "PUT");
       extra_request_headers_.SetHeader(net::HttpRequestHeaders::kContentType,
                                        upload_content_type_);
       if (!upload_content_.empty()) {
@@ -771,11 +773,11 @@ void URLFetcherCore::StartURLRequest() {
           &URLFetcherCore::InformDelegateUploadProgress);
       break;
 
-    case URLFetcher::HEAD:
+    case net::URLFetcher::HEAD:
       request_->set_method("HEAD");
       break;
 
-    case URLFetcher::DELETE_REQUEST:
+    case net::URLFetcher::DELETE_REQUEST:
       request_->set_method("DELETE");
       break;
 
@@ -928,7 +930,7 @@ void URLFetcherCore::NotifyMalformedContent() {
   DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
   if (url_throttler_entry_ != NULL) {
     int status_code = response_code_;
-    if (status_code == URLFetcher::RESPONSE_CODE_INVALID) {
+    if (status_code == net::URLFetcher::RESPONSE_CODE_INVALID) {
       // The status code will generally be known by the time clients
       // call the |ReceivedContentWasMalformed()| function (which ends up
       // calling the current function) but if it's not, we need to assume
diff --git a/content/common/net/url_fetcher_core.h b/content/common/net/url_fetcher_core.h
index 9694a83d..211dbe1 100644
--- a/content/common/net/url_fetcher_core.h
+++ b/content/common/net/url_fetcher_core.h
@@ -45,9 +45,9 @@ class URLFetcherCore
     : public base::RefCountedThreadSafe<URLFetcherCore>,
       public net::URLRequest::Delegate {
  public:
-  URLFetcherCore(URLFetcher* fetcher,
+  URLFetcherCore(net::URLFetcher* fetcher,
                  const GURL& original_url,
-                 URLFetcher::RequestType request_type,
+                 net::URLFetcher::RequestType request_type,
                  net::URLFetcherDelegate* d);
 
   // Starts the load.  It's important that this not happen in the constructor
@@ -294,10 +294,10 @@ class URLFetcherCore
   void InformDelegateDownloadDataInDelegateThread(
       scoped_ptr<std::string> download_data);
 
-  URLFetcher* fetcher_;              // Corresponding fetcher object
+  net::URLFetcher* fetcher_;         // Corresponding fetcher object
   GURL original_url_;                // The URL we were asked to fetch
   GURL url_;                         // The URL we eventually wound up at
-  URLFetcher::RequestType request_type_;  // What type of request is this?
+  net::URLFetcher::RequestType request_type_;  // What type of request is this?
   net::URLRequestStatus status_;     // Status of the request
   net::URLFetcherDelegate* delegate_;  // Object to notify on completion
   scoped_refptr<base::MessageLoopProxy> delegate_loop_proxy_;
diff --git a/content/common/net/url_fetcher_impl.cc b/content/common/net/url_fetcher_impl.cc
index 1a3ff60..c0709f5 100644
--- a/content/common/net/url_fetcher_impl.cc
+++ b/content/common/net/url_fetcher_impl.cc
@@ -13,18 +13,18 @@
 static content::URLFetcherFactory* g_factory = NULL;
 
 // static
-content::URLFetcher* content::URLFetcher::Create(
+net::URLFetcher* content::URLFetcher::Create(
     const GURL& url,
-    RequestType request_type,
+    net::URLFetcher::RequestType request_type,
     net::URLFetcherDelegate* d) {
   return new URLFetcherImpl(url, request_type, d);
 }
 
 // static
-content::URLFetcher* content::URLFetcher::Create(
+net::URLFetcher* content::URLFetcher::Create(
     int id,
     const GURL& url,
-    RequestType request_type,
+    net::URLFetcher::RequestType request_type,
     net::URLFetcherDelegate* d) {
   return g_factory ? g_factory->CreateURLFetcher(id, url, request_type, d) :
                      new URLFetcherImpl(url, request_type, d);
diff --git a/content/common/net/url_fetcher_impl.h b/content/common/net/url_fetcher_impl.h
index e451eeb..9fb9776 100644
--- a/content/common/net/url_fetcher_impl.h
+++ b/content/common/net/url_fetcher_impl.h
@@ -26,7 +26,7 @@ class URLFetcherDelegate;
 class URLFetcherFactory;
 }  // namespace content
 
-class CONTENT_EXPORT URLFetcherImpl : public content::URLFetcher {
+class CONTENT_EXPORT URLFetcherImpl : public net::URLFetcher {
  public:
   // |url| is the URL to send the request to.
   // |request_type| is the type of request to make.
@@ -36,7 +36,7 @@ class CONTENT_EXPORT URLFetcherImpl : public content::URLFetcher {
                  net::URLFetcherDelegate* d);
   virtual ~URLFetcherImpl();
 
-  // content::URLFetcher implementation:
+  // net::URLFetcher implementation:
   virtual void SetUploadData(const std::string& upload_content_type,
                              const std::string& upload_content) OVERRIDE;
   virtual void SetChunkedUpload(
diff --git a/content/common/net/url_fetcher_impl_unittest.cc b/content/common/net/url_fetcher_impl_unittest.cc
index 9e1374b..d8bacd0 100644
--- a/content/common/net/url_fetcher_impl_unittest.cc
+++ b/content/common/net/url_fetcher_impl_unittest.cc
@@ -126,7 +126,7 @@ class URLFetcherTest : public testing::Test,
 };
 
 void URLFetcherTest::CreateFetcher(const GURL& url) {
-  fetcher_ = new URLFetcherImpl(url, content::URLFetcher::GET, this);
+  fetcher_ = new URLFetcherImpl(url, net::URLFetcher::GET, this);
   fetcher_->SetRequestContext(new ThrottlingTestURLRequestContextGetter(
       io_message_loop_proxy(), request_context()));
   fetcher_->Start();
@@ -364,7 +364,7 @@ class URLFetcherFileTest : public URLFetcherTest {
 };
 
 void URLFetcherPostTest::CreateFetcher(const GURL& url) {
-  fetcher_ = new URLFetcherImpl(url, content::URLFetcher::POST, this);
+  fetcher_ = new URLFetcherImpl(url, net::URLFetcher::POST, this);
   fetcher_->SetRequestContext(new ThrottlingTestURLRequestContextGetter(
       io_message_loop_proxy(), request_context()));
   fetcher_->SetUploadData("application/x-www-form-urlencoded",
@@ -380,7 +380,7 @@ void URLFetcherPostTest::OnURLFetchComplete(const net::URLFetcher* source) {
 }
 
 void URLFetcherDownloadProgressTest::CreateFetcher(const GURL& url) {
-  fetcher_ = new URLFetcherImpl(url, content::URLFetcher::GET, this);
+  fetcher_ = new URLFetcherImpl(url, net::URLFetcher::GET, this);
   fetcher_->SetRequestContext(new ThrottlingTestURLRequestContextGetter(
       io_message_loop_proxy(), request_context()));
   previous_progress_ = 0;
@@ -398,7 +398,7 @@ void URLFetcherDownloadProgressTest::OnURLFetchDownloadProgress(
 }
 
 void URLFetcherDownloadProgressCancelTest::CreateFetcher(const GURL& url) {
-  fetcher_ = new URLFetcherImpl(url, content::URLFetcher::GET, this);
+  fetcher_ = new URLFetcherImpl(url, net::URLFetcher::GET, this);
   fetcher_->SetRequestContext(new ThrottlingTestURLRequestContextGetter(
       io_message_loop_proxy(), request_context()));
   cancelled_ = false;
@@ -424,7 +424,7 @@ void URLFetcherDownloadProgressCancelTest::OnURLFetchComplete(
 }
 
 void URLFetcherUploadProgressTest::CreateFetcher(const GURL& url) {
-  fetcher_ = new URLFetcherImpl(url, content::URLFetcher::POST, this);
+  fetcher_ = new URLFetcherImpl(url, net::URLFetcher::POST, this);
   fetcher_->SetRequestContext(new ThrottlingTestURLRequestContextGetter(
       io_message_loop_proxy(), request_context()));
   previous_progress_ = 0;
@@ -470,7 +470,7 @@ void URLFetcherSocketAddressTest::OnURLFetchComplete(
 }
 
 void URLFetcherProtectTest::CreateFetcher(const GURL& url) {
-  fetcher_ = new URLFetcherImpl(url, content::URLFetcher::GET, this);
+  fetcher_ = new URLFetcherImpl(url, net::URLFetcher::GET, this);
   fetcher_->SetRequestContext(new ThrottlingTestURLRequestContextGetter(
       io_message_loop_proxy(), request_context()));
   start_time_ = Time::Now();
@@ -510,7 +510,7 @@ void URLFetcherProtectTest::OnURLFetchComplete(
 }
 
 void URLFetcherProtectTestPassedThrough::CreateFetcher(const GURL& url) {
-  fetcher_ = new URLFetcherImpl(url, content::URLFetcher::GET, this);
+  fetcher_ = new URLFetcherImpl(url, net::URLFetcher::GET, this);
   fetcher_->SetRequestContext(new ThrottlingTestURLRequestContextGetter(
       io_message_loop_proxy(), request_context()));
   fetcher_->SetAutomaticallyRetryOn5xx(false);
@@ -573,7 +573,7 @@ void URLFetcherBadHTTPSTest::OnURLFetchComplete(
 }
 
 void URLFetcherCancelTest::CreateFetcher(const GURL& url) {
-  fetcher_ = new URLFetcherImpl(url, content::URLFetcher::GET, this);
+  fetcher_ = new URLFetcherImpl(url, net::URLFetcher::GET, this);
   CancelTestURLRequestContextGetter* context_getter =
       new CancelTestURLRequestContextGetter(io_message_loop_proxy(),
                                             url);
@@ -627,7 +627,7 @@ void URLFetcherMultipleAttemptTest::OnURLFetchComplete(
 
 void URLFetcherFileTest::CreateFetcherForFile(const GURL& url,
                                               const FilePath& file_path) {
-  fetcher_ = new URLFetcherImpl(url, content::URLFetcher::GET, this);
+  fetcher_ = new URLFetcherImpl(url, net::URLFetcher::GET, this);
   fetcher_->SetRequestContext(new ThrottlingTestURLRequestContextGetter(
       io_message_loop_proxy(), request_context()));
 
@@ -637,7 +637,7 @@ void URLFetcherFileTest::CreateFetcherForFile(const GURL& url,
 }
 
 void URLFetcherFileTest::CreateFetcherForTempFile(const GURL& url) {
-  fetcher_ = new URLFetcherImpl(url, content::URLFetcher::GET, this);
+  fetcher_ = new URLFetcherImpl(url, net::URLFetcher::GET, this);
   fetcher_->SetRequestContext(new ThrottlingTestURLRequestContextGetter(
       io_message_loop_proxy(), request_context()));
 
diff --git a/content/public/common/url_fetcher.h b/content/public/common/url_fetcher.h
index e1f9c27..ac5ba60 100644
--- a/content/public/common/url_fetcher.h
+++ b/content/public/common/url_fetcher.h
@@ -17,22 +17,22 @@ namespace content {
 
 // TODO(akalin): Move the static functions to net::URLFetcher and
 // remove content::URLFetcher.
-class CONTENT_EXPORT URLFetcher : public net::URLFetcher {
+class CONTENT_EXPORT URLFetcher {
  public:
   // |url| is the URL to send the request to.
   // |request_type| is the type of request to make.
   // |d| the object that will receive the callback on fetch completion.
-  static URLFetcher* Create(const GURL& url,
-                            RequestType request_type,
-                            net::URLFetcherDelegate* d);
+  static net::URLFetcher* Create(const GURL& url,
+                                 net::URLFetcher::RequestType request_type,
+                                 net::URLFetcherDelegate* d);
 
   // Like above, but if there's a URLFetcherFactory registered with the
   // implementation it will be used. |id| may be used during testing to identify
   // who is creating the URLFetcher.
-  static URLFetcher* Create(int id,
-                            const GURL& url,
-                            RequestType request_type,
-                            net::URLFetcherDelegate* d);
+  static net::URLFetcher* Create(int id,
+                                 const GURL& url,
+                                 net::URLFetcher::RequestType request_type,
+                                 net::URLFetcherDelegate* d);
 
   // Cancels all existing URLFetchers.  Will notify the URLFetcherDelegates.
   // Note that any new URLFetchers created while this is running will not be
diff --git a/content/public/common/url_fetcher_factory.h b/content/public/common/url_fetcher_factory.h
index c600a26..5e8b890 100644
--- a/content/public/common/url_fetcher_factory.h
+++ b/content/public/common/url_fetcher_factory.h
@@ -6,7 +6,7 @@
 #define CONTENT_PUBLIC_COMMON_URL_FETCHER_FACTORY_H_
 #pragma once
 
-#include "content/public/common/url_fetcher.h"
+#include "net/url_request/url_fetcher.h"
 
 namespace net {
 class URLFetcherDelegate;
@@ -18,10 +18,10 @@ namespace content {
 // URLFetcher. Factory is intended for testing.
 class URLFetcherFactory {
  public:
-  virtual URLFetcher* CreateURLFetcher(
+  virtual net::URLFetcher* CreateURLFetcher(
       int id,
       const GURL& url,
-      URLFetcher::RequestType request_type,
+      net::URLFetcher::RequestType request_type,
       net::URLFetcherDelegate* d) = 0;
 
  protected:
diff --git a/content/test/test_url_fetcher_factory.cc b/content/test/test_url_fetcher_factory.cc
index db44acf..d61b46d 100644
--- a/content/test/test_url_fetcher_factory.cc
+++ b/content/test/test_url_fetcher_factory.cc
@@ -219,10 +219,10 @@ TestURLFetcherFactory::TestURLFetcherFactory()
 
 TestURLFetcherFactory::~TestURLFetcherFactory() {}
 
-content::URLFetcher* TestURLFetcherFactory::CreateURLFetcher(
+net::URLFetcher* TestURLFetcherFactory::CreateURLFetcher(
     int id,
     const GURL& url,
-    content::URLFetcher::RequestType request_type,
+    net::URLFetcher::RequestType request_type,
     net::URLFetcherDelegate* d) {
   TestURLFetcher* fetcher = new TestURLFetcher(id, url, d);
   fetchers_[id] = fetcher;
@@ -297,10 +297,10 @@ FakeURLFetcherFactory::FakeURLFetcherFactory(
 
 FakeURLFetcherFactory::~FakeURLFetcherFactory() {}
 
-content::URLFetcher* FakeURLFetcherFactory::CreateURLFetcher(
+net::URLFetcher* FakeURLFetcherFactory::CreateURLFetcher(
     int id,
     const GURL& url,
-    content::URLFetcher::RequestType request_type,
+    net::URLFetcher::RequestType request_type,
     net::URLFetcherDelegate* d) {
   FakeResponseMap::const_iterator it = fake_responses_.find(url);
   if (it == fake_responses_.end()) {
@@ -330,10 +330,10 @@ URLFetcherImplFactory::URLFetcherImplFactory() {}
 
 URLFetcherImplFactory::~URLFetcherImplFactory() {}
 
-content::URLFetcher* URLFetcherImplFactory::CreateURLFetcher(
+net::URLFetcher* URLFetcherImplFactory::CreateURLFetcher(
     int id,
     const GURL& url,
-    content::URLFetcher::RequestType request_type,
+    net::URLFetcher::RequestType request_type,
     net::URLFetcherDelegate* d) {
   return new URLFetcherImpl(url, request_type, d);
 }
diff --git a/content/test/test_url_fetcher_factory.h b/content/test/test_url_fetcher_factory.h
index a7e82e8..86036fc 100644
--- a/content/test/test_url_fetcher_factory.h
+++ b/content/test/test_url_fetcher_factory.h
@@ -54,14 +54,14 @@ class ScopedURLFetcherFactory : public base::NonThreadSafe {
 // might want to use the FakeURLFetcher and FakeURLFetcherFactory classes
 // below.
 
-class TestURLFetcher : public content::URLFetcher {
+class TestURLFetcher : public net::URLFetcher {
  public:
   TestURLFetcher(int id,
                  const GURL& url,
                  net::URLFetcherDelegate* d);
   virtual ~TestURLFetcher();
 
-  // content::URLFetcher implementation
+  // net::URLFetcher implementation
   virtual void SetUploadData(const std::string& upload_content_type,
                              const std::string& upload_content) OVERRIDE;
   virtual void SetChunkedUpload(
@@ -186,10 +186,10 @@ class TestURLFetcherFactory : public content::URLFetcherFactory,
   TestURLFetcherFactory();
   virtual ~TestURLFetcherFactory();
 
-  virtual content::URLFetcher* CreateURLFetcher(
+  virtual net::URLFetcher* CreateURLFetcher(
       int id,
       const GURL& url,
-      content::URLFetcher::RequestType request_type,
+      net::URLFetcher::RequestType request_type,
       net::URLFetcherDelegate* d) OVERRIDE;
   TestURLFetcher* GetFetcherByID(int id) const;
   void RemoveFetcherFromMap(int id);
@@ -248,10 +248,10 @@ class FakeURLFetcherFactory : public content::URLFetcherFactory,
   // NULL.
   // Otherwise, it will return a URLFetcher object which will respond with the
   // pre-baked response that the client has set by calling SetFakeResponse().
-  virtual content::URLFetcher* CreateURLFetcher(
+  virtual net::URLFetcher* CreateURLFetcher(
       int id,
       const GURL& url,
-      content::URLFetcher::RequestType request_type,
+      net::URLFetcher::RequestType request_type,
       net::URLFetcherDelegate* d) OVERRIDE;
 
   // Sets the fake response for a given URL.  If success is true we will serve
@@ -282,10 +282,10 @@ class URLFetcherImplFactory : public content::URLFetcherFactory {
   virtual ~URLFetcherImplFactory();
 
   // This method will create a real URLFetcher.
-  virtual content::URLFetcher* CreateURLFetcher(
+  virtual net::URLFetcher* CreateURLFetcher(
       int id,
       const GURL& url,
-      content::URLFetcher::RequestType request_type,
+      net::URLFetcher::RequestType request_type,
       net::URLFetcherDelegate* d) OVERRIDE;
 
 };