Make alternate Jobs not use HTTP/1.1 sockets.

net/http/http_stream_factory_impl_job.cc

 // Copyright (c) 2012 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.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 992 matching lines @@
     // Other state (i.e. |using_ssl_|) suggests that |connection_| will have an
     // SSL socket, but there was an error before that could happen.  This
     // puts the in progress HttpProxy socket into |connection_| in order to
     // complete the auth (or read the response body).  The tunnel restart code
     // is careful to remove it before returning control to the rest of this
     // class.
     connection_.reset(connection_->release_pending_http_proxy_connection());
     return result;
   }
 
+  if (IsSpdyAlternate() && !using_spdy_) {
+    job_status_ = STATUS_BROKEN;
+    MaybeMarkAlternativeServiceBroken();
+    return ERR_NPN_NEGOTIATION_FAILED;
+  }
+
   if (!ssl_started && result < 0 && IsAlternate()) {
     job_status_ = STATUS_BROKEN;
     // TODO(bnc): if (result == ERR_ALTERNATIVE_CERT_NOT_VALID_FOR_ORIGIN), then
     // instead of marking alternative service broken, mark (origin, alternative
     // service) couple as invalid.
     MaybeMarkAlternativeServiceBroken();
     return result;
   }
 
   if (using_quic_) {
@@ skipping 67 matching lines @@
   stream_.reset(new SpdyHttpStream(session, use_relative_url));
   return OK;
 }
 
 int HttpStreamFactoryImpl::Job::DoCreateStream() {
   // TODO(pkasting): Remove ScopedTracker below once crbug.com/462811 is fixed.
   tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "462811 HttpStreamFactoryImpl::Job::DoCreateStream"));
   DCHECK(connection_->socket() || existing_spdy_session_.get() || using_quic_);
+  DCHECK(!IsAlternate() || IsSpdyAlternate());

[Ryan Hamilton, 2015/05/05 20:51:12]

nit: Personally, I find it hard to read dchecks with "complex" predicates. If I
do something which triggers this code, I often have to stare at it a few times
to figure out what the unexpected behavior is. I'd write it as:

if (IsAlternate()) 
  DCHECK(IsSpdyAlternate());

Which makes it really obvious.

But this is me personal preference. Feel free to keep it if you find it more
readable this way.

[Bence, 2015/05/06 13:21:56]

Good point.  Done.

 
   next_state_ = STATE_CREATE_STREAM_COMPLETE;
 
   // We only set the socket motivation if we're the first to use
   // this socket.  Is there a race for two SPDY requests?  We really
   // need to plumb this through to the connect level.
   if (connection_->socket() && !connection_->is_reused())
     SetSocketMotivation();
 
   if (!using_spdy_) {

[Ryan Hamilton, 2015/05/05 20:51:12]

Can you add a DHECK(!IsSpdyAlternate()) here?

[Bence, 2015/05/06 13:21:55]

Done.

     // We may get ftp scheme when fetching ftp resources through proxy.
     bool using_proxy = (proxy_info_.is_http() || proxy_info_.is_https()) &&
                        (request_info_.url.SchemeIs("http") ||
                         request_info_.url.SchemeIs("ftp"));
     if (stream_factory_->for_websockets_) {
       DCHECK(request_);
       DCHECK(request_->websocket_handshake_stream_create_helper());
       websocket_stream_.reset(
           request_->websocket_handshake_stream_create_helper()
               ->CreateBasicStream(connection_.Pass(), using_proxy));
@@ skipping 426 matching lines @@
 
 void HttpStreamFactoryImpl::Job::
     MaybeCopyConnectionAttemptsFromClientSocketHandleToRequest() {
   if (IsOrphaned() || !connection_)
     return;
 
   request_->AddConnectionAttempts(connection_->connection_attempts());
 }
 
 }  // namespace net