Added DISABLE_ALTERNATE_PROTOCOLS load flag, and use it for DRP probe.

net/http/http_stream_factory_impl.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.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
+#include "net/base/load_flags.h"
 #include "net/base/net_log.h"
 #include "net/base/net_util.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties.h"
 #include "net/http/http_stream_factory_impl_job.h"
 #include "net/http/http_stream_factory_impl_request.h"
 #include "net/spdy/spdy_http_stream.h"
 #include "url/gurl.h"
 
 namespace net {
@@ skipping 80 matching lines @@
   Request* request = new Request(request_info.url,
                                  this,
                                  delegate,
                                  websocket_handshake_stream_create_helper,
                                  net_log);
 
   GURL alternate_url;
   AlternateProtocolInfo alternate =
       GetAlternateProtocolRequestFor(request_info.url, &alternate_url);
   Job* alternate_job = NULL;
-  if (alternate.protocol != UNINITIALIZED_ALTERNATE_PROTOCOL) {
+  if (alternate.protocol != UNINITIALIZED_ALTERNATE_PROTOCOL &&
+      (request_info.load_flags & LOAD_DISABLE_ALTERNATE_PROTOCOLS) == 0) {
     // Never share connection with other jobs for FTP requests.
     DCHECK(!request_info.url.SchemeIs("ftp"));
 
     HttpRequestInfo alternate_request_info = request_info;
     alternate_request_info.url = alternate_url;
     alternate_job =
         new Job(this, session_, alternate_request_info, priority,
                 server_ssl_config, proxy_ssl_config, net_log.net_log());
     request->AttachJob(alternate_job);
     alternate_job->MarkAsAlternate(request_info.url, alternate);
@@ skipping 23 matching lines @@
     int num_streams,
     const HttpRequestInfo& request_info,
     RequestPriority priority,
     const SSLConfig& server_ssl_config,
     const SSLConfig& proxy_ssl_config) {
   DCHECK(!for_websockets_);
   GURL alternate_url;
   AlternateProtocolInfo alternate =
       GetAlternateProtocolRequestFor(request_info.url, &alternate_url);
   Job* job = NULL;
-  if (alternate.protocol != UNINITIALIZED_ALTERNATE_PROTOCOL) {
+  if (alternate.protocol != UNINITIALIZED_ALTERNATE_PROTOCOL &&
+      (request_info.load_flags & LOAD_DISABLE_ALTERNATE_PROTOCOLS) == 0) {

[Ryan Hamilton, 2015/02/12 23:48:37]

Since this is in two places, could you consider moving this logic down to
HttpStreamFactoryImpl::GetAlternateProtocolRequestFor? (Pass in the load_flags
as an additional argument to that method).

[sclittle, 2015/02/13 19:32:26]

Done.

     HttpRequestInfo alternate_request_info = request_info;
     alternate_request_info.url = alternate_url;
     job = new Job(this, session_, alternate_request_info, priority,
                   server_ssl_config, proxy_ssl_config, session_->net_log());
     job->MarkAsAlternate(request_info.url, alternate);
   } else {
     job = new Job(this, session_, request_info, priority,
                   server_ssl_config, proxy_ssl_config, session_->net_log());
   }
   preconnect_job_set_.insert(job);
@@ skipping 127 matching lines @@
   delete job;
 }
 
 void HttpStreamFactoryImpl::OnPreconnectsComplete(const Job* job) {
   preconnect_job_set_.erase(job);
   delete job;
   OnPreconnectsCompleteInternal();
 }
 
 }  // namespace net