Revert of Unify enum NextProto and enum AlternateProtocol.

net/socket/ssl_client_socket_impl.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/socket/ssl_client_socket_impl.h"
 
 #include <errno.h>
 #include <string.h>
 
 #include <utility>
@@ skipping 176 matching lines @@
   std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   const char* version_str;
   SSLVersionToString(&version_str,
                      SSLConnectionStatusToVersion(ssl_info.connection_status));
   dict->SetString("version", version_str);
   dict->SetBoolean("is_resumed",
                    ssl_info.handshake_type == SSLInfo::HANDSHAKE_RESUME);
   dict->SetInteger("cipher_suite", SSLConnectionStatusToCipherSuite(
                                        ssl_info.connection_status));
 
-  dict->SetString("next_proto",
-                  NextProtoToString(socket->GetNegotiatedProtocol()));
+  dict->SetString("next_proto", SSLClientSocket::NextProtoToString(
+                                    socket->GetNegotiatedProtocol()));
 
   return std::move(dict);
 }
 
 int GetBufferSize(const char* field_trial) {
   // Get buffer sizes from field trials, if possible. If values not present,
   // use default.  Also make sure values are in reasonable range.
   int buffer_size = kDefaultOpenSSLBufferSize;
 #if !defined(OS_NACL)
   int override_buffer_size;
@@ skipping 1789 matching lines @@
     if (ERR_GET_REASON(info->error_code) == SSL_R_TLSV1_ALERT_ACCESS_DENIED &&
         !certificate_requested_) {
       net_error = ERR_SSL_PROTOCOL_ERROR;
     }
   }
 
   return net_error;
 }
 
 }  // namespace net