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 840 matching lines @@
   // paused.
   if (waiting_job_) {
     waiting_job_->Resume(this);
     waiting_job_ = NULL;
   }
 
   if (proxy_info_.is_http() || proxy_info_.is_https())
     establishing_tunnel_ = using_ssl_;
 
   // TODO(bnc): s/want_spdy_over_npn/expect_spdy_over_npn/
   bool want_spdy_over_npn = IsAlternate();

[davidben, 2015/05/01 23:21:46]

(I'm guessing this is to be cleaned up in a follow-up?)

[Bence, 2015/05/04 12:05:07]

Yes, that's the plan.

 
   if (proxy_info_.is_https()) {
     InitSSLConfig(proxy_info_.proxy_server().host_port_pair(),
                   &proxy_ssl_config_,
                   true /* is a proxy server */);
     // Disable revocation checking for HTTPS proxies since the revocation
     // requests are probably going to need to go through the proxy too.
     proxy_ssl_config_.rev_checking_enabled = false;
   }
   if (using_ssl_) {
@@ skipping 232 matching lines @@
 
   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_) {
+    if (IsAlternate()) {
+      return ERR_NPN_NEGOTIATION_FAILED;
+    }

[davidben, 2015/05/01 23:21:46]

Nit: While I do like curly braces, Chromium style is to omit them.

[Bence, 2015/05/04 12:05:07]

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