Revert of Unify enum NextProto and enum AlternateProtocol.

net/spdy/spdy_session.cc

Index: net/spdy/spdy_session.cc
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index a0fa807e87e0947273f5dc81f096bca17278a030..b79c5e62e3d17f2745c369428c8ac35d9d663349 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -126,7 +126,7 @@
   if (source.IsValid()) {
     source.AddToEventParameters(dict.get());
   }
-  dict->SetString("protocol", NextProtoToString(kProtoHTTP2));
+  dict->SetString("protocol", SSLClientSocket::NextProtoToString(kProtoHTTP2));
   return std::move(dict);
 }
 
@@ -1713,9 +1713,9 @@
 
   dict->SetBoolean("is_secure", is_secure_);
 
-  dict->SetString(
-      "negotiated_protocol",
-      NextProtoToString(connection_->socket()->GetNegotiatedProtocol()));
+  dict->SetString("negotiated_protocol",
+                  SSLClientSocket::NextProtoToString(
+                      connection_->socket()->GetNegotiatedProtocol()));
 
   dict->SetInteger("error", error_on_close_);
   dict->SetInteger("max_concurrent_streams", max_concurrent_streams_);
@@ -2284,8 +2284,9 @@
   alternative_service_info_vector.reserve(altsvc_vector.size());
   const base::Time now(base::Time::Now());
   for (const SpdyAltSvcWireFormat::AlternativeService& altsvc : altsvc_vector) {
-    const NextProto protocol = NextProtoFromString(altsvc.protocol_id);
-    if (protocol == kProtoUnknown)
+    const AlternateProtocol protocol =
+        AlternateProtocolFromString(altsvc.protocol_id);
+    if (protocol == UNINITIALIZED_ALTERNATE_PROTOCOL)
       continue;
     const AlternativeService alternative_service(protocol, altsvc.host,
                                                  altsvc.port);