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=
[email protected],[email protected],[email protected],[email protected]
Review URL: https://chromiumcodereview.appspot.com/10412050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138443 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc
index 7f70be68..5ab3c46 100644
--- a/chrome/browser/alternate_nav_url_fetcher.cc
+++ b/chrome/browser/alternate_nav_url_fetcher.cc
@@ -192,7 +192,7 @@
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 @@
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 @@
// 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 6f6e7c9a..498cdf9 100644
--- a/chrome/browser/captive_portal/captive_portal_service.cc
+++ b/chrome/browser/captive_portal/captive_portal_service.cc
@@ -352,7 +352,7 @@
}
}
-// 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 @@
// 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..9cd5eb81 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 @@
}
// 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 9b1eb231..287780c 100644
--- a/chrome/browser/chrome_to_mobile_service.cc
+++ b/chrome/browser/chrome_to_mobile_service.cc
@@ -349,7 +349,7 @@
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 @@
}
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::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 f0e455d4..afd1973 100644
--- a/chrome/browser/chromeos/login/mock_url_fetchers.cc
+++ b/chrome/browser/chromeos/login/mock_url_fetchers.cc
@@ -23,7 +23,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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..cb01aba5 100644
--- a/chrome/browser/chromeos/login/mock_url_fetchers.h
+++ b/chrome/browser/chromeos/login/mock_url_fetchers.h
@@ -28,7 +28,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
// 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 @@
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 @@
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 @@
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 @@
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 cd3f5a05..ae394dde 100644
--- a/chrome/browser/extensions/app_notify_channel_setup.h
+++ b/chrome/browser/extensions/app_notify_channel_setup.h
@@ -125,7 +125,7 @@
// 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 @@
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 70f0f649..cc4e9acd 100644
--- a/chrome/browser/extensions/apps_promo.cc
+++ b/chrome/browser/extensions/apps_promo.cc
@@ -358,7 +358,7 @@
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 @@
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 @@
}
} 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 2fca0f222..9155f3f 100644
--- a/chrome/browser/extensions/webstore_inline_installer.cc
+++ b/chrome/browser/extensions/webstore_inline_installer.cc
@@ -171,7 +171,7 @@
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 a8784ef5..911596f2 100644
--- a/chrome/browser/extensions/webstore_install_helper.cc
+++ b/chrome/browser/extensions/webstore_install_helper.cc
@@ -59,7 +59,7 @@
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 @@
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 @@
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::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 b3f340d7..7db816b7d 100644
--- a/chrome/browser/google/google_url_tracker.h
+++ b/chrome/browser/google/google_url_tracker.h
@@ -176,7 +176,7 @@
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 @@
// 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 @@
// 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 @@
~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 @@
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 @@
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..13eea3a0 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -241,7 +241,7 @@
// 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 @@
// 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 @@
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 31d55fcf..f6ee49d 100644
--- a/chrome/browser/net/gaia/gaia_oauth_fetcher.cc
+++ b/chrome/browser/net/gaia/gaia_oauth_fetcher.cc
@@ -70,7 +70,7 @@
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 67baab04..c6a518a 100644
--- a/chrome/browser/net/sdch_dictionary_fetcher.cc
+++ b/chrome/browser/net/sdch_dictionary_fetcher.cc
@@ -67,7 +67,7 @@
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 edaeb683..9657719f 100644
--- a/chrome/browser/policy/device_management_service.cc
+++ b/chrome/browser/policy/device_management_service.cc
@@ -282,7 +282,7 @@
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 @@
}
void DeviceManagementRequestJobImpl::ConfigureRequest(
- content::URLFetcher* fetcher) {
+ net::URLFetcher* fetcher) {
std::string payload;
CHECK(request_.SerializeToString(&payload));
fetcher->SetUploadData(kPostContentType, payload);
@@ -510,8 +510,8 @@
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 c0f0fff1..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 @@
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 3ca6ef6b..b2907ce7 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 @@
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 cc7079f6..c4d50ac4 100644
--- a/chrome/browser/profiles/profile_downloader.cc
+++ b/chrome/browser/profiles/profile_downloader.cc
@@ -245,7 +245,7 @@
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 @@
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 a272443d..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 @@
// 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 @@
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 34e2e8c0..914c674 100644
--- a/chrome/browser/safe_browsing/download_protection_service.cc
+++ b/chrome/browser/safe_browsing/download_protection_service.cc
@@ -680,7 +680,7 @@
<< 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 @@
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..fa98e810 100644
--- a/chrome/browser/safe_browsing/malware_details_cache.cc
+++ b/chrome/browser/safe_browsing/malware_details_cache.cc
@@ -83,7 +83,7 @@
}
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 dd535676..fcee8bf 100644
--- a/chrome/browser/safe_browsing/protocol_manager.cc
+++ b/chrome/browser/safe_browsing/protocol_manager.cc
@@ -153,8 +153,8 @@
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 @@
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 @@
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 @@
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::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 50eb4f7ea..708ea361 100644
--- a/chrome/browser/safe_browsing/safe_browsing_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_test.cc
@@ -529,7 +529,7 @@
// 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 @@
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 f46d4227..60b8ade 100644
--- a/chrome/browser/search_engines/template_url_fetcher.cc
+++ b/chrome/browser/search_engines/template_url_fetcher.cc
@@ -62,7 +62,7 @@
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 @@
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 @@
}
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 7ca37175..63a5e1c 100644
--- a/chrome/browser/spellchecker/spelling_service_client.cc
+++ b/chrome/browser/spellchecker/spelling_service_client.cc
@@ -122,7 +122,7 @@
}
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..bd361441 100644
--- a/chrome/browser/spellchecker/spelling_service_client_unittest.cc
+++ b/chrome/browser/spellchecker/spelling_service_client_unittest.cc
@@ -131,7 +131,7 @@
}
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 @@
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..8c39568b 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -553,8 +553,8 @@
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 d659bb9d..a8c7ea2 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -814,7 +814,7 @@
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 @@
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 @@
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 @@
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..660c86da 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 @@
// 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 275aa53b..8f59f487 100644
--- a/chrome/browser/web_resource/web_resource_service.cc
+++ b/chrome/browser/web_resource/web_resource_service.cc
@@ -208,7 +208,7 @@
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 |
