Revert of Unify enum NextProto and enum AlternateProtocol.

net/http/http_server_properties.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_server_properties.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "net/socket/ssl_client_socket.h"
@@ skipping 45 matching lines @@
                               ALTERNATE_PROTOCOL_USAGE_MAX);
   }
 }
 
 void HistogramBrokenAlternateProtocolLocation(
     BrokenAlternateProtocolLocation location){
   UMA_HISTOGRAM_ENUMERATION("Net.AlternateProtocolBrokenLocation", location,
                             BROKEN_ALTERNATE_PROTOCOL_LOCATION_MAX);
 }
 
-bool IsAlternateProtocolValid(NextProto protocol) {
+bool IsAlternateProtocolValid(AlternateProtocol protocol) {
   switch (protocol) {
-    case kProtoUnknown:
+    case NPN_HTTP_2:
+      return true;
+    case QUIC:
+      return true;
+    case UNINITIALIZED_ALTERNATE_PROTOCOL:
       return false;
-    case kProtoHTTP11:
-      return false;
-    case kProtoHTTP2:
-      return true;
-    case kProtoQUIC:
-      return true;
   }
   NOTREACHED();
   return false;
 }
 
+const char* AlternateProtocolToString(AlternateProtocol protocol) {
+  switch (protocol) {
+    case QUIC:
+      return "quic";
+    case NPN_HTTP_2:
+      return "h2";
+    case UNINITIALIZED_ALTERNATE_PROTOCOL:
+      return "Uninitialized";
+  }
+  NOTREACHED();
+  return "";
+}
+
+AlternateProtocol AlternateProtocolFromString(const std::string& str) {
+  if (str == "quic")
+    return QUIC;
+  if (str == "h2")
+    return NPN_HTTP_2;
+  // "npn-h2" and "npn-spdy/3.1" are accepted here so that persisted settings
+  // with the old string can be loaded from disk.  TODO(bnc):  Remove around
+  // 2016 December.
+  if (str == "npn-h2")
+    return NPN_HTTP_2;
+  if (str == "npn-spdy/3.1")
+    return NPN_HTTP_2;
+
+  return UNINITIALIZED_ALTERNATE_PROTOCOL;
+}
+
+AlternateProtocol AlternateProtocolFromNextProto(NextProto next_proto) {
+  switch (next_proto) {
+    case kProtoHTTP2:
+      return NPN_HTTP_2;
+    case kProtoQUIC:
+      return QUIC;
+
+    case kProtoUnknown:
+    case kProtoHTTP11:
+      break;
+  }
+
+  NOTREACHED() << "Invalid NextProto: " << next_proto;
+  return UNINITIALIZED_ALTERNATE_PROTOCOL;
+}
+
 std::string AlternativeService::ToString() const {
-  return base::StringPrintf("%s %s:%d", NextProtoToString(protocol),
+  return base::StringPrintf("%s %s:%d", AlternateProtocolToString(protocol),
                             host.c_str(), port);
 }
 
 std::string AlternativeServiceInfo::ToString() const {
   base::Time::Exploded exploded;
   expiration.LocalExplode(&exploded);
   return base::StringPrintf(
       "%s, expires %04d-%02d-%02d %02d:%02d:%02d",
       alternative_service.ToString().c_str(), exploded.year, exploded.month,
       exploded.day_of_month, exploded.hour, exploded.minute, exploded.second);
 }
 
 // static
 void HttpServerProperties::ForceHTTP11(SSLConfig* ssl_config) {
   ssl_config->alpn_protos.clear();
   ssl_config->alpn_protos.push_back(kProtoHTTP11);
 }
 
 }  // namespace net