Revert of Unify enum NextProto and enum AlternateProtocol.

net/http/http_stream_factory.cc

Index: net/http/http_stream_factory.cc
diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc
index 8bff8df39127e219b57e34993f87b631fb219a53..82c51e9fe0ff8576161f41c0784d502cb98b6b33 100644
--- a/net/http/http_stream_factory.cc
+++ b/net/http/http_stream_factory.cc
@@ -44,15 +44,15 @@
   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) {