Race preconnects to HTTP2 proxies that support alternate proxies

net/http/http_stream_factory_impl_job.cc

Index: net/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index ca3652e917a6a663341d6c9a6d43b1ceea95e0f1..a4fd88e50094b22dcde773ae914157183ef81bdf 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -226,7 +226,7 @@ HttpStreamFactoryImpl::Job::Job(Delegate* delegate,
          (job_type_ == ALTERNATIVE || job_type_ == PRECONNECT));
   // If the alternative proxy server is valid, then the job type must be
   // set to ALTERNATIVE.
-  DCHECK(!alternative_proxy_server_.is_valid() || job_type_ == ALTERNATIVE);
+  DCHECK(!alternative_proxy_server_.is_valid() || job_type_ != MAIN);
 
   if (IsSpdyAlternative()) {
     DCHECK(origin_url_.SchemeIs(url::kHttpsScheme));
@@ -298,7 +298,7 @@ LoadState HttpStreamFactoryImpl::Job::GetLoadState() const {
 }
 
 void HttpStreamFactoryImpl::Job::Resume() {
-  DCHECK_EQ(job_type_, MAIN);
+  DCHECK(job_type_ == MAIN || job_type_ == PRECONNECT);
   DCHECK_EQ(next_state_, STATE_WAIT_COMPLETE);
   OnIOComplete(OK);
 }
@@ -324,6 +324,11 @@ void HttpStreamFactoryImpl::Job::SetPriority(RequestPriority priority) {
   // preconnect state.
 }
 
+void HttpStreamFactoryImpl::Job::RestrictNumStreamsToOne() {
+  DCHECK_EQ(PRECONNECT, job_type_);
+  num_streams_ = 1;
+}
+
 bool HttpStreamFactoryImpl::Job::was_alpn_negotiated() const {
   return was_alpn_negotiated_;
 }