Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1298)

Unified Diff: net/url_request/url_request_job.cc

Issue 1523433002: Remove support for a URLRequest having a NULL Delegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix iOS Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/url_request/url_request_job.cc
diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc
index 80170d507969c57228c1dd89bcbbbaa014e21b35..2a90ce089ef17d6548039d7375fd6222a21b4c92 100644
--- a/net/url_request/url_request_job.cc
+++ b/net/url_request/url_request_job.cc
@@ -379,9 +379,6 @@ void URLRequestJob::NotifyBeforeNetworkStart(bool* defer) {
}
void URLRequestJob::NotifyHeadersComplete() {
- if (!request_->has_delegate())
- return; // The request was destroyed, so there is no more work to do.
-
if (has_handled_response_)
return;
@@ -420,10 +417,8 @@ void URLRequestJob::NotifyHeadersComplete() {
// Ensure that the request wasn't detached, destroyed, or canceled in
// NotifyReceivedRedirect.
- if (!weak_this || !request_->has_delegate() ||
- !request_->status().is_success()) {
+ if (!weak_this || !request_->status().is_success())
return;
- }
if (defer_redirect) {
deferred_redirect_info_ = redirect_info;
@@ -482,9 +477,6 @@ void URLRequestJob::ReadRawDataComplete(int result) {
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"475755 URLRequestJob::RawReadCompleted"));
- if (!request_->has_delegate())
- return; // The request was destroyed, so there is no more work to do.
-
// TODO(darin): Bug 1004233. Re-enable this test once all of the chrome
// unit_tests have been fixed to not trip this.
#if 0
@@ -614,7 +606,7 @@ void URLRequestJob::NotifyDone(const URLRequestStatus &status) {
void URLRequestJob::CompleteNotifyDone() {
// Check if we should notify the delegate that we're done because of an error.
- if (!request_->status().is_success() && request_->has_delegate()) {
+ if (!request_->status().is_success()) {
// We report the error differently depending on whether we've called
// OnResponseStarted yet.
if (has_handled_response_) {

Powered by Google App Engine
This is Rietveld 408576698