Revert of Unify enum NextProto and enum AlternateProtocol.

net/http/http_network_transaction.cc

Index: net/http/http_network_transaction.cc
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index a8a7d1ae7b7f0792c3f2795f62676f862ce8457e..3d39fd6e139736aec6f28279d497fe901c4a2468 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -55,8 +55,9 @@
 #include "net/log/net_log_event_type.h"
 #include "net/proxy/proxy_server.h"
 #include "net/socket/client_socket_factory.h"
-#include "net/socket/next_proto.h"
 #include "net/socket/socks_client_socket_pool.h"
+#include "net/socket/ssl_client_socket.h"
+#include "net/socket/ssl_client_socket_pool.h"
 #include "net/socket/transport_client_socket_pool.h"
 #include "net/spdy/spdy_http_stream.h"
 #include "net/spdy/spdy_session.h"
@@ -471,8 +472,8 @@
   server_ssl_config_ = used_ssl_config;
   proxy_info_ = used_proxy_info;
   response_.was_alpn_negotiated = stream_request_->was_alpn_negotiated();
-  response_.alpn_negotiated_protocol =
-      NextProtoToString(stream_request_->negotiated_protocol());
+  response_.alpn_negotiated_protocol = SSLClientSocket::NextProtoToString(
+      stream_request_->negotiated_protocol());
   response_.was_fetched_via_spdy = stream_request_->using_spdy();
   response_.was_fetched_via_proxy = !proxy_info_.is_direct();
   if (response_.was_fetched_via_proxy && !proxy_info_.is_empty())