JobController 2: Remove reference between HttpStreamFactoryImpl::Jobs.

net/http/http_stream_factory_impl_job_controller.cc

 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_stream_factory_impl_job_controller.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "net/base/host_mapping_rules.h"
 #include "net/http/bidirectional_stream_impl.h"
 #include "net/http/http_stream_factory_impl.h"
 #include "net/http/http_stream_factory_impl_job.h"
 #include "net/http/http_stream_factory_impl_request.h"
 #include "net/http/transport_security_state.h"
 #include "net/spdy/spdy_session.h"
 
 namespace net {
 
 HttpStreamFactoryImpl::JobController::JobController(
     HttpStreamFactoryImpl* factory,
     HttpStreamRequest::Delegate* delegate,
     HttpNetworkSession* session)
     : factory_(factory),
       session_(session),
       request_(nullptr),
       delegate_(delegate),
       is_preconnect_(false),
       job_bound_(false),
+      blocking_(false),
       bound_job_(nullptr) {
   DCHECK(factory);
 }
 
 HttpStreamFactoryImpl::JobController::~JobController() {
   main_job_.reset();
   alternative_job_.reset();
   bound_job_ = nullptr;
 }
 
@@ skipping 344 matching lines @@
                                    used_proxy_info, was_npn_negotiated,
                                    protocol_negotiated, using_spdy, net_log);
   }
   if (is_job_orphaned) {
     OnOrphanedJobComplete(job);
   }
 }
 
 void HttpStreamFactoryImpl::JobController::OnPreconnectsComplete(Job* job) {
   DCHECK_EQ(main_job_.get(), job);
+  DCHECK(!bound_job_);
   main_job_.reset();
   factory_->OnPreconnectsCompleteInternal();
   MaybeNotifyFactoryOfCompletion();
 }
 
 void HttpStreamFactoryImpl::JobController::OnOrphanedJobComplete(
     const Job* job) {
   if (job->job_type() == MAIN) {
     DCHECK_EQ(main_job_.get(), job);
     main_job_.reset();
@@ skipping 49 matching lines @@
     DCHECK(ContainsKey(spdy_session_request_map, *spdy_session_key));
     RequestSet& request_set = spdy_session_request_map[*spdy_session_key];
     DCHECK(ContainsKey(request_set, request_));
     request_set.erase(request_);
     if (request_set.empty())
       spdy_session_request_map.erase(*spdy_session_key);
     request_->ResetSpdySessionKey();
   }
 }
 
+void HttpStreamFactoryImpl::JobController::MaybeResumeOtherJob(
+    Job* job,
+    const base::TimeDelta& delay) {
+  if (!blocking_)
+    return;
+
+  if (job == alternative_job_.get() && main_job_) {
+    main_job_->Resume(delay);
+  } else if (job != main_job_.get() && job != alternative_job_.get()) {

[Ryan Hamilton, 2016/05/17 22:14:09]

nit: I might move this to a DCHECK() at the top of the method:

DCHECK(job == alternative_job_.get() || job == main_job_.get());

[Zhongyi Shi, 2016/06/29 21:49:03]

Done.

+    NOTREACHED();
+  }
+  blocking_ = false;
+}
+
+bool HttpStreamFactoryImpl::JobController::ResumeJobWithDelay(Job* job) const {
+  base::WeakPtrFactory<Job> ptr_factory(job);
+  if (wait_time_.is_zero()) {
+    if (job->job_type() == ALTERNATIVE || !blocking_) {
+      // There is no blocking job and there is no |wait_time_|.
+      return false;
+    }
+  } else {
+    DCHECK(job->job_type() == ALTERNATIVE || !blocking_);
+    job->ResumeAfterDelay(wait_time_);
+  }
+  return true;
+}
 const BoundNetLog* HttpStreamFactoryImpl::JobController::GetNetLog(
     Job* job) const {
   if (is_preconnect_ || (job_bound_ && bound_job_ != job))
     return nullptr;
   DCHECK(request_);
   return &request_->net_log();
 }
 
 WebSocketHandshakeStreamBase::CreateHelper* HttpStreamFactoryImpl::
     JobController::websocket_handshake_stream_create_helper() {
@@ skipping 33 matching lines @@
     HostPortPair alternative_destination(alternative_service.host_port_pair());
     ignore_result(
         ApplyHostMappingRules(request_info.url, &alternative_destination));
 
     alternative_job_.reset(
         new Job(this, ALTERNATIVE, session_, request_info, priority,
                 server_ssl_config, proxy_ssl_config, alternative_destination,
                 origin_url, alternative_service, net_log.net_log()));
     AttachJob(alternative_job_.get());
 
-    main_job_->WaitFor(alternative_job_.get());
-    // Make sure to wait until we call WaitFor(), before starting
-    // |alternative_job|, otherwise |alternative_job| will not notify |job|
-    // appropriately.
+    blocking_ = true;
     alternative_job_->Start(request_->stream_type());
   }
   // Even if |alternative_job| has already finished, it will not have notified
   // the request yet, since we defer that to the next iteration of the
   // MessageLoop, so starting |main_job_| is always safe.
   main_job_->Start(request_->stream_type());
 }
 
 void HttpStreamFactoryImpl::JobController::AttachJob(Job* job) {
   DCHECK(job);
@@ skipping 238 matching lines @@
       first_alternative_service = alternative_service;
   }
 
   // Ask delegate to mark QUIC as broken for the origin.
   if (quic_advertised && quic_all_broken && delegate != nullptr)
     delegate->OnQuicBroken();
 
   return first_alternative_service;
 }
 }