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 c821af32f4f04e3e2ee6f39690e60b7dce4818d1..ec3827716e372fb5e2cbb3acd66e36433f4114aa 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 @@ void HttpStreamFactoryImpl::JobController:: |
} |
} |
-const NetLogWithSource* HttpStreamFactoryImpl::JobController::GetNetLog( |
- Job* job) const { |
+const NetLogWithSource* HttpStreamFactoryImpl::JobController::GetNetLog() |
+ const { |
return &net_log_; |
} |
@@ -773,10 +773,11 @@ void HttpStreamFactoryImpl::JobController::CancelJobs() { |
void HttpStreamFactoryImpl::JobController::OrphanUnboundJob() { |
DCHECK(request_); |
+ DCHECK(bound_job_); |
RemoveRequestFromSpdySessionRequestMap(); |
- DCHECK(bound_job_); |
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. |
@@ -789,6 +790,7 @@ void HttpStreamFactoryImpl::JobController::OrphanUnboundJob() { |
DCHECK(alternative_job_); |
main_job_.reset(); |
} else { |
+ DCHECK(!for_websockets()); |
main_job_->Orphan(); |
} |
} |