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

Unified Diff: net/http/http_stream_factory_impl_job_controller.cc

Issue 2806383002: Revert of Remove unreachable code in HttpStreamFactoryImpl::Job::Orphan (Closed)
Patch Set: Created 3 years, 8 months 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
« no previous file with comments | « net/http/http_stream_factory_impl_job_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_job_controller.cc
diff --git a/net/http/http_stream_factory_impl_job_controller.cc b/net/http/http_stream_factory_impl_job_controller.cc
index ec3827716e372fb5e2cbb3acd66e36433f4114aa..c821af32f4f04e3e2ee6f39690e60b7dce4818d1 100644
--- a/net/http/http_stream_factory_impl_job_controller.cc
+++ b/net/http/http_stream_factory_impl_job_controller.cc
@@ -660,8 +660,8 @@
}
}
-const NetLogWithSource* HttpStreamFactoryImpl::JobController::GetNetLog()
- const {
+const NetLogWithSource* HttpStreamFactoryImpl::JobController::GetNetLog(
+ Job* job) const {
return &net_log_;
}
@@ -773,11 +773,10 @@
void HttpStreamFactoryImpl::JobController::OrphanUnboundJob() {
DCHECK(request_);
+ RemoveRequestFromSpdySessionRequestMap();
+
DCHECK(bound_job_);
- RemoveRequestFromSpdySessionRequestMap();
-
if (bound_job_->job_type() == MAIN && alternative_job_) {
- DCHECK(!for_websockets());
alternative_job_->Orphan();
} else if (bound_job_->job_type() == ALTERNATIVE && main_job_) {
// Orphan main job.
@@ -790,7 +789,6 @@
DCHECK(alternative_job_);
main_job_.reset();
} else {
- DCHECK(!for_websockets());
main_job_->Orphan();
}
}
« no previous file with comments | « net/http/http_stream_factory_impl_job_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698