When Alt-Svc header processing is enabled, do not process Alternate-Protocol

net/http/http_network_transaction.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_network_transaction.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 56 matching lines @@
 #include "url/gurl.h"
 #include "url/url_canon.h"
 
 namespace net {
 
 namespace {
 
 void ProcessAlternativeServices(HttpNetworkSession* session,
                                 const HttpResponseHeaders& headers,
                                 const HostPortPair& http_host_port_pair) {
-  if (session->params().parse_alternative_services &&
-      headers.HasHeader(kAlternativeServiceHeader)) {
-    std::string alternative_service_str;
-    headers.GetNormalizedHeader(kAlternativeServiceHeader,
-                                &alternative_service_str);
-    session->http_stream_factory()->ProcessAlternativeService(
-        session->http_server_properties(), alternative_service_str,
-        http_host_port_pair, *session);
-    // If there is an "Alt-Svc" header, then ignore "Alternate-Protocol".
+  if (session->params().parse_alternative_services) {
+    if (headers.HasHeader(kAlternativeServiceHeader)) {
+      std::string alternative_service_str;
+      headers.GetNormalizedHeader(kAlternativeServiceHeader,
+                                  &alternative_service_str);
+      session->http_stream_factory()->ProcessAlternativeService(
+          session->http_server_properties(), alternative_service_str,
+          http_host_port_pair, *session);
+    }
+    // If "Alt-Svc" is enabled, then ignore "Alternate-Protocol".
     return;
   }
 
   if (!headers.HasHeader(kAlternateProtocolHeader))
     return;
 
   std::vector<std::string> alternate_protocol_values;
   size_t iter = 0;
   std::string alternate_protocol_str;
   while (headers.EnumerateHeader(&iter, kAlternateProtocolHeader,
@@ skipping 1720 matching lines @@
   DCHECK(stream_request_);
 
   // Since the transaction can restart with auth credentials, it may create a
   // stream more than once. Accumulate all of the connection attempts across
   // those streams by appending them to the vector:
   for (const auto& attempt : stream_request_->connection_attempts())
     connection_attempts_.push_back(attempt);
 }
 
 }  // namespace net