Revert of Unify enum NextProto and enum AlternateProtocol.

net/http/http_server_properties_manager.cc

Index: net/http/http_server_properties_manager.cc
diff --git a/net/http/http_server_properties_manager.cc b/net/http/http_server_properties_manager.cc
index 18f3edf3bdee7dc735c47325a8710fe0aa9238e1..1f91bb691d9dafcf834710962d247e5188cd8ec3 100644
--- a/net/http/http_server_properties_manager.cc
+++ b/net/http/http_server_properties_manager.cc
@@ -632,7 +632,7 @@
              << server_str;
     return false;
   }
-  NextProto protocol = NextProtoFromString(protocol_str);
+  AlternateProtocol protocol = AlternateProtocolFromString(protocol_str);
   if (!IsAlternateProtocolValid(protocol)) {
     DVLOG(1) << "Invalid alternative service protocol string for server: "
              << server_str;
@@ -1189,7 +1189,7 @@
       alternative_service_dict->SetString(kHostKey, alternative_service.host);
     }
     alternative_service_dict->SetString(
-        kProtocolKey, NextProtoToString(alternative_service.protocol));
+        kProtocolKey, AlternateProtocolToString(alternative_service.protocol));
     // JSON cannot store int64_t, so expiration is converted to a string.
     alternative_service_dict->SetString(
         kExpirationKey,