Split enable_alternative_service_with_different_host flag.

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/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "net/base/host_mapping_rules.h"
@@ skipping 708 matching lines @@
   HttpServerProperties& http_server_properties =
       *session_->http_server_properties();
   const AlternativeServiceVector alternative_service_vector =
       http_server_properties.GetAlternativeServices(origin);
   if (alternative_service_vector.empty())
     return AlternativeService();
 
   bool quic_advertised = false;
   bool quic_all_broken = true;
 
-  const bool enable_different_host =
-      session_->params().enable_alternative_service_with_different_host;
-
   // First Alt-Svc that is not marked as broken.
   AlternativeService first_alternative_service;
 
   for (const AlternativeService& alternative_service :
        alternative_service_vector) {
     DCHECK(IsAlternateProtocolValid(alternative_service.protocol));
     if (!quic_advertised && alternative_service.protocol == QUIC)
       quic_advertised = true;
     if (http_server_properties.IsAlternativeServiceBroken(
             alternative_service)) {
       HistogramAlternateProtocolUsage(ALTERNATE_PROTOCOL_USAGE_BROKEN);
       continue;
     }
 
-    if (origin.host() != alternative_service.host && !enable_different_host)
-      continue;
 
     // Some shared unix systems may have user home directories (like
     // http://foo.com/~mike) which allow users to emit headers.  This is a bad
     // idea already, but with Alternate-Protocol, it provides the ability for a
     // single user on a multi-user system to hijack the alternate protocol.
     // These systems also enforce ports <1024 as restricted ports.  So don't
     // allow protocol upgrades to user-controllable ports.
     const int kUnrestrictedPort = 1024;
     if (!session_->params().enable_user_alternate_protocol_ports &&
         (alternative_service.port >= kUnrestrictedPort &&
          origin.port() < kUnrestrictedPort))
       continue;
 
     if (alternative_service.protocol >= NPN_SPDY_MINIMUM_VERSION &&
         alternative_service.protocol <= NPN_SPDY_MAXIMUM_VERSION) {
       if (!HttpStreamFactory::spdy_enabled())
         continue;
 
-      // TODO(bnc): Re-enable when https://crbug.com/615413 is fixed.
-      if (origin.host() != alternative_service.host)
+      if (origin.host() != alternative_service.host &&
+          !session_->params()
+               .enable_http2_alternative_service_with_different_host) {
         continue;
+      }
 
       // Cache this entry if we don't have a non-broken Alt-Svc yet.
       if (first_alternative_service.protocol ==
           UNINITIALIZED_ALTERNATE_PROTOCOL)
         first_alternative_service = alternative_service;
       continue;
     }
 
     DCHECK_EQ(QUIC, alternative_service.protocol);
+    if (origin.host() != alternative_service.host &&
+        !session_->params()
+             .enable_quic_alternative_service_with_different_host) {
+      continue;
+    }
+
     quic_all_broken = false;
     if (!session_->params().enable_quic)
       continue;
 
     if (!IsQuicWhitelistedForHost(origin.host()))
       continue;
 
     if (stream_type == HttpStreamRequest::BIDIRECTIONAL_STREAM &&
         session_->params().quic_disable_bidirectional_streams) {
       continue;
@@ skipping 24 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;
 }
 }