Revert of Unify enum NextProto and enum AlternateProtocol.

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 26 matching lines @@
   if (!SpdyAltSvcWireFormat::ParseHeaderFieldValue(
           alternative_service_str, &alternative_service_vector)) {
     return;
   }
 
   // Convert SpdyAltSvcWireFormat::AlternativeService entries
   // to net::AlternativeServiceInfo.
   AlternativeServiceInfoVector alternative_service_info_vector;
   for (const SpdyAltSvcWireFormat::AlternativeService&
            alternative_service_entry : alternative_service_vector) {
-    NextProto protocol =
-        NextProtoFromString(alternative_service_entry.protocol_id);
+    AlternateProtocol protocol =
+        AlternateProtocolFromString(alternative_service_entry.protocol_id);
     if (!IsAlternateProtocolValid(protocol) ||
         !session->IsProtocolEnabled(protocol) ||
         !IsPortValid(alternative_service_entry.port)) {
       continue;
     }
     // Check if QUIC version is supported.
-    if (protocol == kProtoQUIC && !alternative_service_entry.version.empty()) {
+    if (protocol == QUIC && !alternative_service_entry.version.empty()) {
       bool match_found = false;
       for (QuicVersion supported : session->params().quic_supported_versions) {
         for (uint16_t advertised : alternative_service_entry.version) {
           if (supported == advertised) {
             match_found = true;
             break;
           }
         }
         if (match_found) {
           break;
@@ skipping 24 matching lines @@
     const url::SchemeHostPort& server) {
   HostPortPair host_port_pair(server.host(), server.port());
   const HostMappingRules* mapping_rules = GetHostMappingRules();
   if (mapping_rules)
     mapping_rules->RewriteHost(&host_port_pair);
   return url::SchemeHostPort(server.scheme(), host_port_pair.host(),
                              host_port_pair.port());
 }
 
 }  // namespace net