Introduce AlternateProtocolInfo.is_broken.

net/http/http_stream_factory.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.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 50 matching lines @@
 
     if (!base::StringToInt(port_protocol_vector[0], &port) ||
         port <= 0 || port >= 1 << 16) {
       DVLOG(1) << kAlternateProtocolHeader
                << " header has unrecognizable port: "
                << port_protocol_vector[0];
       return;
     }
 
     protocol =
         AlternateProtocolFromString(port_protocol_vector[1]);

[Ryan Hamilton, 2014/11/05 17:05:20]

Can this fit on one line?

Can you confirm what will happen if an old version of chrome writes out BROKEN,
and then a new version of Chrome tries to read it in? I *suspect* that
AlternateProtocolFromString() will not return a valid alternate protocol in this
case, and all will be well, but please make sure this is correct.

[Bence, 2014/11/06 00:26:00]

Sorry, git cl format is broken on my machine.
Confirmed.  Protocol string will be "Broken", for which
AlternateProtocolFromString will return UNINITIALIZED_ALTERNATE_PROTOCOL, for
which IsAlternateProtocolValid will return false.

+
     if (IsAlternateProtocolValid(protocol) &&
         !session.IsProtocolEnabled(protocol)) {
-      protocol = ALTERNATE_PROTOCOL_BROKEN;
-    }
-
-    if (protocol == ALTERNATE_PROTOCOL_BROKEN) {
       DVLOG(1) << kAlternateProtocolHeader
                << " header has unrecognized protocol: "
                << port_protocol_vector[1];
       return;
     }
   }
 
   if (protocol == UNINITIALIZED_ALTERNATE_PROTOCOL)
     return;
 
   HostPortPair host_port(http_host_port_pair);
   const HostMappingRules* mapping_rules = GetHostMappingRules();
   if (mapping_rules)
     mapping_rules->RewriteHost(&host_port);
 
   if (http_server_properties->HasAlternateProtocol(host_port)) {
     const AlternateProtocolInfo existing_alternate =
         http_server_properties->GetAlternateProtocol(host_port);
     // If we think the alternate protocol is broken, don't change it.
-    if (existing_alternate.protocol == ALTERNATE_PROTOCOL_BROKEN)
+    if (existing_alternate.is_broken) {
       return;
+    }

[Ryan Hamilton, 2014/11/05 17:05:20]

net/ style prohibits {}s on one-line ifs. Whee!

[Bence, 2014/11/06 00:26:00]

Lovely.

Done.

   }
 
   http_server_properties->SetAlternateProtocol(host_port, port, protocol,
                                                probability);
 }
 
 GURL HttpStreamFactory::ApplyHostMappingRules(const GURL& url,
                                               HostPortPair* endpoint) {
   const HostMappingRules* mapping_rules = GetHostMappingRules();
   if (mapping_rules && mapping_rules->RewriteHost(endpoint)) {
     url::Replacements<char> replacements;
     const std::string port_str = base::IntToString(endpoint->port());
     replacements.SetPort(port_str.c_str(), url::Component(0, port_str.size()));
     replacements.SetHost(endpoint->host().c_str(),
                          url::Component(0, endpoint->host().size()));
     return url.ReplaceComponents(replacements);
   }
   return url;
 }
 
 HttpStreamFactory::HttpStreamFactory() {}
 
 }  // namespace net