Revert of Unify enum NextProto and enum AlternateProtocol.

net/http/http_server_properties.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_SERVER_PROPERTIES_H_
 #define NET_HTTP_HTTP_SERVER_PROPERTIES_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 48 matching lines @@
   BROKEN_ALTERNATE_PROTOCOL_LOCATION_QUIC_STREAM_FACTORY = 1,
   BROKEN_ALTERNATE_PROTOCOL_LOCATION_HTTP_STREAM_FACTORY_IMPL_JOB_ALT = 2,
   BROKEN_ALTERNATE_PROTOCOL_LOCATION_HTTP_STREAM_FACTORY_IMPL_JOB_MAIN = 3,
   BROKEN_ALTERNATE_PROTOCOL_LOCATION_MAX,
 };
 
 // Log a histogram to reflect |location|.
 NET_EXPORT void HistogramBrokenAlternateProtocolLocation(
     BrokenAlternateProtocolLocation location);
 
-NET_EXPORT bool IsAlternateProtocolValid(NextProto protocol);
+enum AlternateProtocol {
+  NPN_HTTP_2,
+  QUIC,
+  UNINITIALIZED_ALTERNATE_PROTOCOL,
+};
+
+NET_EXPORT bool IsAlternateProtocolValid(AlternateProtocol protocol);
+
+NET_EXPORT const char* AlternateProtocolToString(AlternateProtocol protocol);
+NET_EXPORT AlternateProtocol AlternateProtocolFromString(
+    const std::string& str);
+NET_EXPORT_PRIVATE AlternateProtocol AlternateProtocolFromNextProto(
+    NextProto next_proto);
 
 // (protocol, host, port) triple as defined in
 // https://tools.ietf.org/id/draft-ietf-httpbis-alt-svc-06.html
 struct NET_EXPORT AlternativeService {
-  AlternativeService() : protocol(kProtoUnknown), host(), port(0) {}
+  AlternativeService()
+      : protocol(UNINITIALIZED_ALTERNATE_PROTOCOL), host(), port(0) {}
 
-  AlternativeService(NextProto protocol, const std::string& host, uint16_t port)
+  AlternativeService(AlternateProtocol protocol,
+                     const std::string& host,
+                     uint16_t port)
       : protocol(protocol), host(host), port(port) {}
 
-  AlternativeService(NextProto protocol, const HostPortPair& host_port_pair)
+  AlternativeService(AlternateProtocol protocol,
+                     const HostPortPair& host_port_pair)
       : protocol(protocol),
         host(host_port_pair.host()),
         port(host_port_pair.port()) {}
 
   AlternativeService(const AlternativeService& alternative_service) = default;
   AlternativeService& operator=(const AlternativeService& alternative_service) =
       default;
 
   HostPortPair host_port_pair() const { return HostPortPair(host, port); }
 
   bool operator==(const AlternativeService& other) const {
     return protocol == other.protocol && host == other.host &&
            port == other.port;
   }
 
   bool operator!=(const AlternativeService& other) const {
     return !this->operator==(other);
   }
 
   bool operator<(const AlternativeService& other) const {
     return std::tie(protocol, host, port) <
            std::tie(other.protocol, other.host, other.port);
   }
 
   std::string ToString() const;
 
-  NextProto protocol;
+  AlternateProtocol protocol;
   std::string host;
   uint16_t port;
 };
 
 struct NET_EXPORT AlternativeServiceInfo {
   AlternativeServiceInfo() : alternative_service() {}
 
   AlternativeServiceInfo(const AlternativeService& alternative_service,
                          base::Time expiration)
       : alternative_service(alternative_service),
         expiration(expiration) {}
 
-  AlternativeServiceInfo(NextProto protocol,
+  AlternativeServiceInfo(AlternateProtocol protocol,
                          const std::string& host,
                          uint16_t port,
                          base::Time expiration)
-      : alternative_service(protocol, host, port), expiration(expiration) {}
+      : alternative_service(protocol, host, port),
+        expiration(expiration) {}
 
   AlternativeServiceInfo(
       const AlternativeServiceInfo& alternative_service_info) = default;
   AlternativeServiceInfo& operator=(
       const AlternativeServiceInfo& alternative_service_info) = default;
 
   bool operator==(const AlternativeServiceInfo& other) const {
     return alternative_service == other.alternative_service &&
            expiration == other.expiration;
   }
@@ skipping 209 matching lines @@
   virtual void SetMaxServerConfigsStoredInProperties(
       size_t max_server_configs_stored_in_properties) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HttpServerProperties);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_SERVER_PROPERTIES_H_