Handle additional feedback from http://codereview.chromium.org/8395038/.

-rename URLFetcherFactory to URLFetcherImplFactory
-rename GetUrl to GetURL and GetOriginalUrl to GetOriginalURL
-get rid of request_type in TestURLFetcher's constructor

BUG=98716
Review URL: http://codereview.chromium.org/8416020

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

30 files changed, 73 insertions, 88 deletions

diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc
index cc1035d..fcb0f5a 100644
--- a/chrome/browser/alternate_nav_url_fetcher.cc
+++ b/chrome/browser/alternate_nav_url_fetcher.cc
@@ -166,7 +166,7 @@ void AlternateNavURLFetcher::OnURLFetchComplete(
     const content::URLFetcher* source) {
   DCHECK_EQ(fetcher_.get(), source);
   SetStatusFromURLFetch(
-      source->GetUrl(), source->GetStatus(), source->GetResponseCode());
+      source->GetURL(), source->GetStatus(), source->GetResponseCode());
   ShowInfobarIfPossible();
   // WARNING: |this| may be deleted!
 }
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index 2f48d77..340f693 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -31,7 +31,7 @@
 //   added to history.
 // . The URL created by using the search term keyword_term_ with keyword_t_url_
 //   is added to history.
-// . test_factory_ is set as the URLFetcher::Factory.
+// . test_factory_ is set as the URLFetcherFactory.
 class SearchProviderTest : public testing::Test,
                            public AutocompleteProvider::ACProviderListener {
  public:
@@ -91,7 +91,7 @@ class SearchProviderTest : public testing::Test,
   MessageLoopForUI message_loop_;
   BrowserThread io_thread_;
 
-  // URLFetcher::Factory implementation registered.
+  // URLFetcherFactory implementation registered.
   TestURLFetcherFactory test_factory_;
 
   // Profile we use.
@@ -259,7 +259,7 @@ TEST_F(SearchProviderTest, QueryDefaultProvider) {
   // And the URL matches what we expected.
   GURL expected_url = GURL(default_t_url_->suggestions_url()->
       ReplaceSearchTerms(*default_t_url_, term, 0, string16()));
-  ASSERT_TRUE(fetcher->GetOriginalUrl() == expected_url);
+  ASSERT_TRUE(fetcher->GetOriginalURL() == expected_url);
 
   // Tell the SearchProvider the suggest query is done.
   fetcher->set_response_code(200);
@@ -319,7 +319,7 @@ TEST_F(SearchProviderTest, QueryKeywordProvider) {
   // And the URL matches what we expected.
   GURL expected_url = GURL(keyword_t_url_->suggestions_url()->
       ReplaceSearchTerms(*keyword_t_url_, term, 0, string16()));
-  ASSERT_TRUE(keyword_fetcher->GetOriginalUrl() == expected_url);
+  ASSERT_TRUE(keyword_fetcher->GetOriginalURL() == expected_url);
 
   // Tell the SearchProvider the keyword suggest query is done.
   keyword_fetcher->set_response_code(200);
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc
index 7703cec..f25b364 100644
--- a/chrome/browser/autofill/autofill_browsertest.cc
+++ b/chrome/browser/autofill/autofill_browsertest.cc
@@ -135,7 +135,7 @@ class AutofillTest : public InProcessBrowserTest {
         "  };"
         "})();";
 
-    fetcher->set_url(fetcher->GetOriginalUrl());
+    fetcher->set_url(fetcher->GetOriginalURL());
     fetcher->set_status(status);
     fetcher->set_response_code(success ? 200 : 500);
     fetcher->SetResponseString(script);
diff --git a/chrome/browser/bug_report_util.cc b/chrome/browser/bug_report_util.cc
index 24eff64..f49fe8e 100644
--- a/chrome/browser/bug_report_util.cc
+++ b/chrome/browser/bug_report_util.cc
@@ -137,7 +137,7 @@ void BugReportUtil::PostCleanup::OnURLFetchComplete(
   }
 
   LOG(WARNING) << "FEEDBACK: Submission to feedback server (" <<
-               source->GetUrl() << ") status: " << error_stream.str();
+               source->GetURL() << ") status: " << error_stream.str();
 
   // Delete the URLFetcher.
   delete source;
diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc
index 128deee..dafc83c 100644
--- a/chrome/browser/chromeos/customization_document.cc
+++ b/chrome/browser/chromeos/customization_document.cc
@@ -320,7 +320,7 @@ void ServicesCustomizationDocument::OnURLFetchComplete(
     }
     LOG(ERROR) << "URL fetch for services customization failed:"
                << " response code = " << source->GetResponseCode()
-               << " URL = " << source->GetUrl().spec();
+               << " URL = " << source->GetURL().spec();
   }
 }
 
diff --git a/chrome/browser/chromeos/login/cookie_fetcher.cc b/chrome/browser/chromeos/login/cookie_fetcher.cc
index 53d57d5..3c578f6 100644
--- a/chrome/browser/chromeos/login/cookie_fetcher.cc
+++ b/chrome/browser/chromeos/login/cookie_fetcher.cc
@@ -44,7 +44,7 @@ void CookieFetcher::AttemptFetch(const std::string& credentials) {
 void CookieFetcher::OnURLFetchComplete(const content::URLFetcher* source) {
   if (source->GetStatus().is_success() &&
       source->GetResponseCode() == kHttpSuccess) {
-    if (issue_handler_->CanHandle(source->GetUrl())) {
+    if (issue_handler_->CanHandle(source->GetURL())) {
       VLOG(1) << "Handling auth token";
       std::string data;
       source->GetResponseAsString(&data);
diff --git a/chrome/browser/chromeos/login/image_downloader.cc b/chrome/browser/chromeos/login/image_downloader.cc
index 9883593..49d4ed6 100644
--- a/chrome/browser/chromeos/login/image_downloader.cc
+++ b/chrome/browser/chromeos/login/image_downloader.cc
@@ -47,7 +47,7 @@ void ImageDownloader::OnURLFetchComplete(const content::URLFetcher* source) {
   source->GetResponseAsString(&data);
   if (source->GetResponseCode() != 200) {
     LOG(ERROR) << "Response code is " << source->GetResponseCode();
-    LOG(ERROR) << "Url is " << source->GetUrl().spec();
+    LOG(ERROR) << "Url is " << source->GetURL().spec();
     LOG(ERROR) << "Data is " << data;
     MessageLoop::current()->DeleteSoon(FROM_HERE, this);
     return;
diff --git a/chrome/browser/chromeos/login/mock_auth_response_handler.cc b/chrome/browser/chromeos/login/mock_auth_response_handler.cc
index c324709c..a312337 100644
--- a/chrome/browser/chromeos/login/mock_auth_response_handler.cc
+++ b/chrome/browser/chromeos/login/mock_auth_response_handler.cc
@@ -43,7 +43,7 @@ void MockAuthResponseHandler::CompleteFetch(
     const net::URLRequestStatus status,
     const int http_response_code,
     const std::string data) {
-  TestURLFetcher fetcher(0, GURL(), content::URLFetcher::GET, delegate);
+  TestURLFetcher fetcher(0, GURL(), delegate);
   fetcher.set_url(remote);
   fetcher.set_status(status);
   fetcher.set_response_code(http_response_code);
diff --git a/chrome/browser/chromeos/login/mock_url_fetchers.cc b/chrome/browser/chromeos/login/mock_url_fetchers.cc
index 8cceef8..14b9445 100644
--- a/chrome/browser/chromeos/login/mock_url_fetchers.cc
+++ b/chrome/browser/chromeos/login/mock_url_fetchers.cc
@@ -24,7 +24,7 @@ ExpectCanceledFetcher::ExpectCanceledFetcher(
     const std::string& results,
     content::URLFetcher::RequestType request_type,
     content::URLFetcherDelegate* d)
-    : TestURLFetcher(0, url, request_type, d),
+    : TestURLFetcher(0, url, d),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
 }
 
@@ -50,7 +50,7 @@ GotCanceledFetcher::GotCanceledFetcher(
     const std::string& results,
     content::URLFetcher::RequestType request_type,
     content::URLFetcherDelegate* d)
-    : TestURLFetcher(0, url, request_type, d) {
+    : TestURLFetcher(0, url, d) {
   set_url(url);
   set_status(net::URLRequestStatus(net::URLRequestStatus::CANCELED, 0));
   set_response_code(RC_FORBIDDEN);
@@ -67,7 +67,7 @@ SuccessFetcher::SuccessFetcher(bool success,
                                const std::string& results,
                                content::URLFetcher::RequestType request_type,
                                content::URLFetcherDelegate* d)
-    : TestURLFetcher(0, url, request_type, d) {
+    : TestURLFetcher(0, url, d) {
   set_url(url);
   set_status(net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0));
   set_response_code(RC_REQUEST_OK);
@@ -84,7 +84,7 @@ FailFetcher::FailFetcher(bool success,
                          const std::string& results,
                          content::URLFetcher::RequestType request_type,
                          content::URLFetcherDelegate* d)
-    : TestURLFetcher(0, url, request_type, d) {
+    : TestURLFetcher(0, url, d) {
   set_url(url);
   set_status(net::URLRequestStatus(net::URLRequestStatus::FAILED, ECONNRESET));
   set_response_code(RC_REQUEST_OK);
@@ -111,7 +111,7 @@ CaptchaFetcher::CaptchaFetcher(bool success,
                                const std::string& results,
                                content::URLFetcher::RequestType request_type,
                                content::URLFetcherDelegate* d)
-    : TestURLFetcher(0, url, request_type, d) {
+    : TestURLFetcher(0, url, d) {
   set_url(url);
   set_status(net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0));
   set_response_code(RC_FORBIDDEN);
@@ -151,7 +151,7 @@ HostedFetcher::HostedFetcher(bool success,
                              const std::string& results,
                              content::URLFetcher::RequestType request_type,
                              content::URLFetcherDelegate* d)
-    : TestURLFetcher(0, url, request_type, d) {
+    : TestURLFetcher(0, url, d) {
   set_url(url);
   set_status(net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0));
   set_response_code(RC_REQUEST_OK);
diff --git a/chrome/browser/chromeos/login/profile_image_downloader.cc b/chrome/browser/chromeos/login/profile_image_downloader.cc
index e9e6833..50b1dfa 100644
--- a/chrome/browser/chromeos/login/profile_image_downloader.cc
+++ b/chrome/browser/chromeos/login/profile_image_downloader.cc
@@ -206,7 +206,7 @@ void ProfileImageDownloader::OnURLFetchComplete(
   source->GetResponseAsString(&data);
   if (source->GetResponseCode() != 200) {
     LOG(ERROR) << "Response code is " << source->GetResponseCode();
-    LOG(ERROR) << "Url is " << source->GetUrl().spec();
+    LOG(ERROR) << "Url is " << source->GetURL().spec();
     LOG(ERROR) << "Data is " << data;
     if (delegate_)
       delegate_->OnDownloadFailure();
diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc
index 3eaa449..bd4a869 100644
--- a/chrome/browser/extensions/extension_updater.cc
+++ b/chrome/browser/extensions/extension_updater.cc
@@ -599,13 +599,13 @@ void ExtensionUpdater::OnURLFetchComplete(const content::URLFetcher* source) {
   if (source == manifest_fetcher_.get()) {
     std::string data;
     source->GetResponseAsString(&data);
-    OnManifestFetchComplete(source->GetUrl(),
+    OnManifestFetchComplete(source->GetURL(),
                             source->GetStatus(),
                             source->GetResponseCode(),
                             data);
   } else if (source == extension_fetcher_.get()) {
     OnCRXFetchComplete(source,
-                       source->GetUrl(),
+                       source->GetURL(),
                        source->GetStatus(),
                        source->GetResponseCode());
   } else {
@@ -1160,7 +1160,7 @@ void ExtensionUpdater::StartUpdateCheck(ManifestFetchData* fetch_data) {
   }
 
   if (manifest_fetcher_.get() != NULL) {
-    if (manifest_fetcher_->GetUrl() != fetch_data->full_url()) {
+    if (manifest_fetcher_->GetURL() != fetch_data->full_url()) {
       manifests_pending_.push_back(scoped_fetch_data.release());
     }
   } else {
@@ -1192,7 +1192,7 @@ void ExtensionUpdater::FetchUpdatedExtension(const std::string& id,
   }
 
   if (extension_fetcher_.get() != NULL) {
-    if (extension_fetcher_->GetUrl() != url) {
+    if (extension_fetcher_->GetURL() != url) {
       extensions_pending_.push_back(ExtensionFetch(id, url, hash, version));
     }
   } else {
diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc
index 59a5360..0894af3 100644
--- a/chrome/browser/extensions/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/extension_updater_unittest.cc
@@ -352,7 +352,7 @@ class ExtensionUpdaterTest : public testing::Test {
     // Get the url our mock fetcher was asked to fetch.
     TestURLFetcher* fetcher =
         factory.GetFetcherByID(ExtensionUpdater::kManifestFetcherId);
-    const GURL& url = fetcher->GetOriginalUrl();
+    const GURL& url = fetcher->GetOriginalURL();
     EXPECT_FALSE(url.is_empty());
     EXPECT_TRUE(url.is_valid());
     EXPECT_TRUE(url.SchemeIs("http"));
@@ -402,7 +402,7 @@ class ExtensionUpdaterTest : public testing::Test {
     TestURLFetcher* fetcher =
         factory.GetFetcherByID(ExtensionUpdater::kManifestFetcherId);
     ASSERT_FALSE(fetcher == NULL);
-    const GURL& url = fetcher->GetOriginalUrl();
+    const GURL& url = fetcher->GetOriginalURL();
 
     EXPECT_FALSE(url.is_empty());
     EXPECT_TRUE(url.is_valid());
@@ -988,7 +988,7 @@ class ExtensionUpdaterTest : public testing::Test {
     TestURLFetcher* fetcher =
       factory.GetFetcherByID(ExtensionUpdater::kManifestFetcherId);
     EXPECT_TRUE(fetcher != NULL && fetcher->delegate() != NULL);
-    fetched_urls.push_back(fetcher->GetOriginalUrl());
+    fetched_urls.push_back(fetcher->GetOriginalURL());
 
     fetcher->set_url(fetched_urls[0]);
     fetcher->set_status(net::URLRequestStatus());
@@ -997,7 +997,7 @@ class ExtensionUpdaterTest : public testing::Test {
     fetcher->delegate()->OnURLFetchComplete(fetcher);
 
     fetcher = factory.GetFetcherByID(ExtensionUpdater::kManifestFetcherId);
-    fetched_urls.push_back(fetcher->GetOriginalUrl());
+    fetched_urls.push_back(fetcher->GetOriginalURL());
 
     // The urls could have been fetched in either order, so use the host to
     // tell them apart and note the query each used.
diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
index e28f2d1..f62c1a0 100644
--- a/chrome/browser/intranet_redirect_detector.cc
+++ b/chrome/browser/intranet_redirect_detector.cc
@@ -111,8 +111,8 @@ void IntranetRedirectDetector::OnURLFetchComplete(
     }
     redirect_origin_ = GURL();
   } else {
-    DCHECK(source->GetUrl().is_valid());
-    GURL origin(source->GetUrl().GetOrigin());
+    DCHECK(source->GetURL().is_valid());
+    GURL origin(source->GetURL().GetOrigin());
     if (resulting_origins_.empty()) {
       resulting_origins_.push_back(origin);
       return;
diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher.cc b/chrome/browser/net/gaia/gaia_oauth_fetcher.cc
index 9ef89d5..2dfd3f1 100644
--- a/chrome/browser/net/gaia/gaia_oauth_fetcher.cc
+++ b/chrome/browser/net/gaia/gaia_oauth_fetcher.cc
@@ -659,7 +659,7 @@ void GaiaOAuthFetcher::OnURLFetchComplete(const content::URLFetcher* source) {
   scoped_ptr<content::URLFetcher> current_fetcher(fetcher_.release());
   fetch_pending_ = false;
   GaiaUrls* gaia_urls = GaiaUrls::GetInstance();
-  GURL url = source->GetUrl();
+  GURL url = source->GetURL();
   std::string data;
   source->GetResponseAsString(&data);
   net::URLRequestStatus status = source->GetStatus();
diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc b/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc
index 9f179d8..c51e0db 100644
--- a/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc
+++ b/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc
@@ -160,8 +160,7 @@ TEST_F(GaiaOAuthFetcherTest, OAuthGetAccessToken) {
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   GURL url(GaiaUrls::GetInstance()->oauth_get_access_token_url());
 
-  TestURLFetcher test_fetcher(
-      0, GURL(), content::URLFetcher::GET, &oauth_fetcher);
+  TestURLFetcher test_fetcher(0, GURL(), &oauth_fetcher);
   test_fetcher.set_url(url);
   test_fetcher.set_status(status);
   test_fetcher.set_response_code(RC_REQUEST_OK);
@@ -196,8 +195,7 @@ TEST_F(GaiaOAuthFetcherTest, OAuthWrapBridge) {
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   GURL url(GaiaUrls::GetInstance()->oauth_wrap_bridge_url());
 
-  TestURLFetcher test_fetcher(
-      0, GURL(), content::URLFetcher::GET, &oauth_fetcher);
+  TestURLFetcher test_fetcher(0, GURL(), &oauth_fetcher);
   test_fetcher.set_url(url);
   test_fetcher.set_status(status);
   test_fetcher.set_response_code(RC_REQUEST_OK);
@@ -227,8 +225,7 @@ TEST_F(GaiaOAuthFetcherTest, UserInfo) {
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   GURL url(GaiaUrls::GetInstance()->oauth_user_info_url());
 
-  TestURLFetcher test_fetcher(
-      0, GURL(), content::URLFetcher::GET, &oauth_fetcher);
+  TestURLFetcher test_fetcher(0, GURL(), &oauth_fetcher);
   test_fetcher.set_url(url);
   test_fetcher.set_status(status);
   test_fetcher.set_response_code(RC_REQUEST_OK);
@@ -253,8 +250,7 @@ TEST_F(GaiaOAuthFetcherTest, OAuthRevokeToken) {
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   GURL url(GaiaUrls::GetInstance()->oauth_revoke_token_url());
 
-  TestURLFetcher test_fetcher(
-      0, GURL(), content::URLFetcher::GET, &oauth_fetcher);
+  TestURLFetcher test_fetcher(0, GURL(), &oauth_fetcher);
   test_fetcher.set_url(url);
   test_fetcher.set_status(status);
   test_fetcher.set_response_code(RC_REQUEST_OK);
diff --git a/chrome/browser/net/sdch_dictionary_fetcher.cc b/chrome/browser/net/sdch_dictionary_fetcher.cc
index 122e976..6606934 100644
--- a/chrome/browser/net/sdch_dictionary_fetcher.cc
+++ b/chrome/browser/net/sdch_dictionary_fetcher.cc
@@ -78,7 +78,7 @@ void SdchDictionaryFetcher::OnURLFetchComplete(
       (source->GetStatus().status() == net::URLRequestStatus::SUCCESS)) {
     std::string data;
     source->GetResponseAsString(&data);
-    net::SdchManager::Global()->AddSdchDictionary(data, source->GetUrl());
+    net::SdchManager::Global()->AddSdchDictionary(data, source->GetURL());
   }
   current_fetch_.reset(NULL);
   ScheduleDelayedRun();
diff --git a/chrome/browser/plugin_download_helper.cc b/chrome/browser/plugin_download_helper.cc
index c3a53c7..1132fb2 100644
--- a/chrome/browser/plugin_download_helper.cc
+++ b/chrome/browser/plugin_download_helper.cc
@@ -44,7 +44,7 @@ void PluginDownloadUrlHelper::OnURLFetchComplete(
     if (source->GetResponseAsFilePath(true, &response_file)) {
       FilePath new_download_file_path =
           response_file.DirName().AppendASCII(
-              download_file_fetcher_->GetUrl().ExtractFileName());
+              download_file_fetcher_->GetURL().ExtractFileName());
 
       file_util::Delete(new_download_file_path, false);
 
diff --git a/chrome/browser/policy/device_management_service_unittest.cc b/chrome/browser/policy/device_management_service_unittest.cc
index aec27f3..7825be4 100644
--- a/chrome/browser/policy/device_management_service_unittest.cc
+++ b/chrome/browser/policy/device_management_service_unittest.cc
@@ -329,7 +329,7 @@ TEST_F(DeviceManagementServiceTest, RegisterRequest) {
   TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
 
-  CheckURLAndQueryParams(fetcher->GetOriginalUrl(),
+  CheckURLAndQueryParams(fetcher->GetOriginalURL(),
                          DeviceManagementBackendImpl::kValueRequestRegister,
                          kDeviceId);
 
@@ -363,14 +363,14 @@ TEST_F(DeviceManagementServiceTest, UnregisterRequest) {
   ASSERT_TRUE(fetcher);
 
   // Check the data the fetcher received.
-  const GURL& request_url(fetcher->GetOriginalUrl());
+  const GURL& request_url(fetcher->GetOriginalURL());
   const GURL service_url(kServiceUrl);
   EXPECT_EQ(service_url.scheme(), request_url.scheme());
   EXPECT_EQ(service_url.host(), request_url.host());
   EXPECT_EQ(service_url.port(), request_url.port());
   EXPECT_EQ(service_url.path(), request_url.path());
 
-  CheckURLAndQueryParams(fetcher->GetOriginalUrl(),
+  CheckURLAndQueryParams(fetcher->GetOriginalURL(),
                          DeviceManagementBackendImpl::kValueRequestUnregister,
                          kDeviceId);
 
@@ -528,7 +528,7 @@ TEST_F(DeviceManagementServiceTest, RetryOnProxyError) {
   TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
   EXPECT_TRUE((fetcher->GetLoadFlags() & net::LOAD_BYPASS_PROXY) == 0);
-  const GURL original_url(fetcher->GetOriginalUrl());
+  const GURL original_url(fetcher->GetOriginalURL());
   const std::string upload_data(fetcher->upload_data());
 
   // Generate a callback with a proxy failure.
@@ -543,7 +543,7 @@ TEST_F(DeviceManagementServiceTest, RetryOnProxyError) {
   fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
   EXPECT_TRUE(fetcher->GetLoadFlags() & net::LOAD_BYPASS_PROXY);
-  EXPECT_EQ(original_url, fetcher->GetOriginalUrl());
+  EXPECT_EQ(original_url, fetcher->GetOriginalURL());
   EXPECT_EQ(upload_data, fetcher->upload_data());
 }
 
@@ -559,7 +559,7 @@ TEST_F(DeviceManagementServiceTest, RetryOnBadResponseFromProxy) {
   TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
   EXPECT_TRUE((fetcher->GetLoadFlags() & net::LOAD_BYPASS_PROXY) == 0);
-  const GURL original_url(fetcher->GetOriginalUrl());
+  const GURL original_url(fetcher->GetOriginalURL());
   const std::string upload_data(fetcher->upload_data());
   fetcher->set_was_fetched_via_proxy(true);
   scoped_refptr<net::HttpResponseHeaders> headers;
@@ -579,7 +579,7 @@ TEST_F(DeviceManagementServiceTest, RetryOnBadResponseFromProxy) {
   fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
   EXPECT_TRUE((fetcher->GetLoadFlags() & net::LOAD_BYPASS_PROXY) != 0);
-  EXPECT_EQ(original_url, fetcher->GetOriginalUrl());
+  EXPECT_EQ(original_url, fetcher->GetOriginalURL());
   EXPECT_EQ(upload_data, fetcher->upload_data());
 }
 
diff --git a/chrome/browser/policy/testing_policy_url_fetcher_factory.cc b/chrome/browser/policy/testing_policy_url_fetcher_factory.cc
index 76ec400..66a1835 100644
--- a/chrome/browser/policy/testing_policy_url_fetcher_factory.cc
+++ b/chrome/browser/policy/testing_policy_url_fetcher_factory.cc
@@ -39,7 +39,6 @@ class TestingPolicyURLFetcher : public TestURLFetcher {
   TestingPolicyURLFetcher(
       const base::WeakPtr<TestingPolicyURLFetcherFactory>& parent,
       const GURL& url,
-      content::URLFetcher::RequestType request_type,
       content::URLFetcherDelegate* delegate);
 
   virtual void Start() OVERRIDE;
@@ -65,9 +64,8 @@ class TestingPolicyURLFetcher : public TestURLFetcher {
 TestingPolicyURLFetcher::TestingPolicyURLFetcher(
     const base::WeakPtr<TestingPolicyURLFetcherFactory>& parent,
     const GURL& url,
-    content::URLFetcher::RequestType request_type,
     content::URLFetcherDelegate* delegate)
-    : TestURLFetcher(0, url, request_type, delegate),
+    : TestURLFetcher(0, url, delegate),
       parent_(parent) {
   set_url(url);
   set_status(net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0));
@@ -78,7 +76,7 @@ void TestingPolicyURLFetcher::Start() {
 
   std::string auth_header;
   net::HttpRequestHeaders headers;
-  std::string request = GetRequestType(GetUrl());
+  std::string request = GetRequestType(GetURL());
   GetExtraRequestHeaders(&headers);
   headers.GetHeader("Authorization", &auth_header);
   // The following method is mocked by the currently running test.
@@ -124,7 +122,7 @@ content::URLFetcher* TestingPolicyURLFetcherFactory::CreateURLFetcher(
     content::URLFetcher::RequestType request_type,
     content::URLFetcherDelegate* delegate) {
   return new TestingPolicyURLFetcher(
-      weak_ptr_factory_.GetWeakPtr(), url, request_type, delegate);
+      weak_ptr_factory_.GetWeakPtr(), url, delegate);
 }
 
 }  // namespace policy
diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
index 7bb0e85..ace424f 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
@@ -190,12 +190,12 @@ void ClientSideDetectionService::OnURLFetchComplete(
   source->GetResponseAsString(&data);
   if (source == model_fetcher_.get()) {
     HandleModelResponse(
-        source, source->GetUrl(), source->GetStatus(),
+        source, source->GetURL(), source->GetStatus(),
         source->GetResponseCode(), source->GetCookies(), data);
   } else if (client_phishing_reports_.find(source) !=
              client_phishing_reports_.end()) {
     HandlePhishingVerdict(
-        source, source->GetUrl(), source->GetStatus(),
+        source, source->GetURL(), source->GetStatus(),
         source->GetResponseCode(), source->GetCookies(), data);
   } else {
     NOTREACHED();
diff --git a/chrome/browser/safe_browsing/malware_details_cache.cc b/chrome/browser/safe_browsing/malware_details_cache.cc
index 1f1bdb1..ced572a 100644
--- a/chrome/browser/safe_browsing/malware_details_cache.cc
+++ b/chrome/browser/safe_browsing/malware_details_cache.cc
@@ -108,14 +108,14 @@ void MalwareDetailsCacheCollector::OnURLFetchComplete(
   if (source->GetStatus().status() != net::URLRequestStatus::SUCCESS &&
       source->GetStatus().error() == net::ERR_CACHE_MISS) {
     // Cache miss, skip this resource.
-    DVLOG(1) << "Cache miss for url: " << source->GetUrl();
+    DVLOG(1) << "Cache miss for url: " << source->GetURL();
     AdvanceEntry();
     return;
   }
 
   if (source->GetStatus().status() != net::URLRequestStatus::SUCCESS) {
     // Some other error occurred, e.g. the request could have been cancelled.
-    DVLOG(1) << "Unsuccessful fetch: " << source->GetUrl();
+    DVLOG(1) << "Unsuccessful fetch: " << source->GetURL();
     AdvanceEntry();
     return;
   }
@@ -124,9 +124,9 @@ void MalwareDetailsCacheCollector::OnURLFetchComplete(
   // might not be the same as the one we asked for.
   // For redirects, resources_it_->first != url.spec().
   ClientMalwareReportRequest::Resource* resource =
-      GetResource(source->GetUrl());
+      GetResource(source->GetURL());
   if (!resource) {
-    DVLOG(1) << "Cannot find resource for url:" << source->GetUrl();
+    DVLOG(1) << "Cannot find resource for url:" << source->GetURL();
     AdvanceEntry();
     return;
   }
diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc
index 20ae1ed..f68dd00 100644
--- a/chrome/browser/safe_browsing/protocol_manager.cc
+++ b/chrome/browser/safe_browsing/protocol_manager.cc
@@ -263,10 +263,10 @@ void SafeBrowsingProtocolManager::OnURLFetchComplete(
     } else {
       HandleGetHashError(Time::Now());
       if (source->GetStatus().status() == net::URLRequestStatus::FAILED) {
-        VLOG(1) << "SafeBrowsing GetHash request for: " << source->GetUrl()
+        VLOG(1) << "SafeBrowsing GetHash request for: " << source->GetURL()
                 << " failed with error: " << source->GetStatus().error();
       } else {
-        VLOG(1) << "SafeBrowsing GetHash request for: " << source->GetUrl()
+        VLOG(1) << "SafeBrowsing GetHash request for: " << source->GetURL()
                 << " failed with error: " << source->GetResponseCode();
       }
     }
@@ -297,9 +297,9 @@ void SafeBrowsingProtocolManager::OnURLFetchComplete(
       std::string data;
       source->GetResponseAsString(&data);
       parsed_ok = HandleServiceResponse(
-          source->GetUrl(), data.data(), static_cast<int>(data.length()));
+          source->GetURL(), data.data(), static_cast<int>(data.length()));
       if (!parsed_ok) {
-        VLOG(1) << "SafeBrowsing request for: " << source->GetUrl()
+        VLOG(1) << "SafeBrowsing request for: " << source->GetURL()
                 << " failed parse.";
         must_back_off = true;
         chunk_request_urls_.clear();
@@ -338,10 +338,10 @@ void SafeBrowsingProtocolManager::OnURLFetchComplete(
         chunk_request_urls_.clear();
       UpdateFinished(false);
       if (source->GetStatus().status() == net::URLRequestStatus::FAILED) {
-        VLOG(1) << "SafeBrowsing request for: " << source->GetUrl()
+        VLOG(1) << "SafeBrowsing request for: " << source->GetURL()
                 << " failed with error: " << source->GetStatus().error();
       } else {
-        VLOG(1) << "SafeBrowsing request for: " << source->GetUrl()
+        VLOG(1) << "SafeBrowsing request for: " << source->GetURL()
                 << " failed with error: " << source->GetResponseCode();
       }
     }
diff --git a/chrome/browser/sync/glue/http_bridge_unittest.cc b/chrome/browser/sync/glue/http_bridge_unittest.cc
index 6535ba1..6efc1a6 100644
--- a/chrome/browser/sync/glue/http_bridge_unittest.cc
+++ b/chrome/browser/sync/glue/http_bridge_unittest.cc
@@ -88,15 +88,6 @@ class HttpBridgeTest : public testing::Test {
   MessageLoop loop_;
 };
 
-class DummyURLFetcher : public TestURLFetcher {
- public:
-  DummyURLFetcher() : TestURLFetcher(0, GURL(), POST, NULL) {}
-
-  net::HttpResponseHeaders* GetResponseHeaders() const {
-    return NULL;
-  }
-};
-
 // An HttpBridge that doesn't actually make network requests and just calls
 // back with dummy response info.
 class ShuntedHttpBridge : public HttpBridge {
@@ -128,7 +119,7 @@ class ShuntedHttpBridge : public HttpBridge {
     net::ResponseCookies cookies;
 
     std::string response_content = "success!";
-    DummyURLFetcher fetcher;
+    TestURLFetcher fetcher(0, GURL(), NULL);
     fetcher.set_url(GURL("www.google.com"));
     fetcher.set_response_code(200);
     fetcher.set_cookies(cookies);
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 33df944..e0693a8 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -383,7 +383,7 @@ void SyncTest::ReadPasswordFile() {
 void SyncTest::SetupMockGaiaResponses() {
   username_ = "user@gmail.com";
   password_ = "password";
-  factory_.reset(new URLFetcherFactory());
+  factory_.reset(new URLFetcherImplFactory());
   fake_factory_.reset(new FakeURLFetcherFactory(factory_.get()));
   fake_factory_->SetFakeResponse(kClientLoginUrl, "SID=sid\nLSID=lsid", true);
   fake_factory_->SetFakeResponse(kGetUserInfoUrl, "email=user@gmail.com", true);
diff --git a/chrome/browser/sync/test/integration/sync_test.h b/chrome/browser/sync/test/integration/sync_test.h
index db17ba3..609ba3e 100644
--- a/chrome/browser/sync/test/integration/sync_test.h
+++ b/chrome/browser/sync/test/integration/sync_test.h
@@ -25,7 +25,7 @@ class CommandLine;
 class Profile;
 class ProfileSyncServiceHarness;
 class FakeURLFetcherFactory;
-class URLFetcherFactory;
+class URLFetcherImplFactory;
 
 namespace net {
 class ProxyConfig;
@@ -310,8 +310,8 @@ class SyncTest : public InProcessBrowserTest {
   // Fake URLFetcher factory used to mock out GAIA signin.
   scoped_ptr<FakeURLFetcherFactory> fake_factory_;
 
-  // The URLFetcherFactory instance used to instantiate |fake_factory_|.
-  scoped_ptr<URLFetcherFactory> factory_;
+  // The URLFetcherImplFactory instance used to instantiate |fake_factory_|.
+  scoped_ptr<URLFetcherImplFactory> factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncTest);
 };
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc
index 7140375..9cc126b 100644
--- a/chrome/browser/translate/translate_manager_browsertest.cc
+++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -190,7 +190,7 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness,
     net::URLRequestStatus status;
     status.set_status(success ? net::URLRequestStatus::SUCCESS :
                                 net::URLRequestStatus::FAILED);
-    fetcher->set_url(fetcher->GetOriginalUrl());
+    fetcher->set_url(fetcher->GetOriginalURL());
     fetcher->set_status(status);
     fetcher->set_response_code(success ? 200 : 500);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
@@ -218,7 +218,7 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness,
       }
       data += "}})";
     }
-    fetcher->set_url(fetcher->GetOriginalUrl());
+    fetcher->set_url(fetcher->GetOriginalURL());
     fetcher->set_status(status);
     fetcher->set_response_code(success ? 200 : 500);
     fetcher->SetResponseString(data);
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher.cc b/chrome/common/net/gaia/gaia_auth_fetcher.cc
index 992cb06..d550de1 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher.cc
+++ b/chrome/common/net/gaia/gaia_auth_fetcher.cc
@@ -578,7 +578,7 @@ void GaiaAuthFetcher::OnMergeSessionFetched(const std::string& data,
 
 void GaiaAuthFetcher::OnURLFetchComplete(const content::URLFetcher* source) {
   fetch_pending_ = false;
-  const GURL& url = source->GetUrl();
+  const GURL& url = source->GetURL();
   const net::URLRequestStatus& status = source->GetStatus();
   int response_code = source->GetResponseCode();
   std::string data;
@@ -592,7 +592,7 @@ void GaiaAuthFetcher::OnURLFetchComplete(const content::URLFetcher* source) {
   } else if (url == token_auth_gurl_) {
     OnTokenAuthFetched(data, status, response_code);
   } else if (url == merge_session_gurl_ ||
-      (source && source->GetOriginalUrl() == merge_session_gurl_)) {
+      (source && source->GetOriginalURL() == merge_session_gurl_)) {
     // MergeSession may redirect, so check the original URL of the fetcher.
     OnMergeSessionFetched(data, status, response_code);
   } else {
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
index cf4be2c..f1f209f 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
+++ b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
@@ -33,7 +33,7 @@ MockFetcher::MockFetcher(bool success,
                          const std::string& results,
                          content::URLFetcher::RequestType request_type,
                          content::URLFetcherDelegate* d)
-    : TestURLFetcher(0, url, request_type, d) {
+    : TestURLFetcher(0, url, d) {
   set_url(url);
   net::URLRequestStatus::Status code;
   
@@ -56,7 +56,7 @@ MockFetcher::MockFetcher(const GURL& url,
                          const std::string& results,
                          content::URLFetcher::RequestType request_type,
                          content::URLFetcherDelegate* d)
-    : TestURLFetcher(0, url, request_type, d) {
+    : TestURLFetcher(0, url, d) {
   set_url(url);
   set_status(status);
   set_response_code(response_code);
diff --git a/chrome/common/net/gaia/gaia_oauth_client_unittest.cc b/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
index 20e41c0..f413c0a 100644
--- a/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
+++ b/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
@@ -32,7 +32,7 @@ class MockOAuthFetcher : public TestURLFetcher {
                    const std::string& results,
                    content::URLFetcher::RequestType request_type,
                    content::URLFetcherDelegate* d)
-    : TestURLFetcher(0, url, request_type, d),
+    : TestURLFetcher(0, url, d),
       max_failure_count_(max_failure_count),
       current_failure_count_(0) {
     set_url(url);
diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.cc b/chrome/service/cloud_print/cloud_print_url_fetcher.cc
index d0cd004..e686685 100644
--- a/chrome/service/cloud_print/cloud_print_url_fetcher.cc
+++ b/chrome/service/cloud_print/cloud_print_url_fetcher.cc
@@ -52,7 +52,7 @@ void CloudPrintURLFetcher::StartPostRequest(
 
 void CloudPrintURLFetcher::OnURLFetchComplete(
     const content::URLFetcher* source) {
-  VLOG(1) << "CP_PROXY: OnURLFetchComplete, url: " << source->GetUrl()
+  VLOG(1) << "CP_PROXY: OnURLFetchComplete, url: " << source->GetURL()
           << ", response code: " << source->GetResponseCode();
   // Make sure we stay alive through the body of this function.
   scoped_refptr<CloudPrintURLFetcher> keep_alive(this);
@@ -60,7 +60,7 @@ void CloudPrintURLFetcher::OnURLFetchComplete(
   source->GetResponseAsString(&data);
   ResponseAction action = delegate_->HandleRawResponse(
       source,
-      source->GetUrl(),
+      source->GetURL(),
       source->GetStatus(),
       source->GetResponseCode(),
       source->GetCookies(),
@@ -78,7 +78,7 @@ void CloudPrintURLFetcher::OnURLFetchComplete(
     if (!source->GetStatus().is_success() || (source->GetResponseCode() != 200))
       action = RETRY_REQUEST;
     else
-      action = delegate_->HandleRawData(source, source->GetUrl(), data);
+      action = delegate_->HandleRawData(source, source->GetURL(), data);
 
     if (action == CONTINUE_PROCESSING) {
       // If the delegate is not interested in handling the raw response data,
@@ -90,7 +90,7 @@ void CloudPrintURLFetcher::OnURLFetchComplete(
       CloudPrintHelpers::ParseResponseJSON(data, &succeeded, &response_dict);
       if (response_dict)
         action = delegate_->HandleJSONData(source,
-                                           source->GetUrl(),
+                                           source->GetURL(),
                                            response_dict,
                                            succeeded);
       else