Implement ALPN for SSLClientSocketOpenSSL.

Also remove server_protos from the SSLClientSocket interface. NSS wasn't
filling it in and NPN is going away eventually. With ALPN, this is less useful.

BUG=388429

Review URL: https://codereview.chromium.org/423623002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286405 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 6 deletions

diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index eefb09c..82d7ed3 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -57,15 +57,12 @@ base::Value* NetLogHttpStreamJobCallback(const GURL* original_url,
 base::Value* NetLogHttpStreamProtoCallback(
     const SSLClientSocket::NextProtoStatus status,
     const std::string* proto,
-    const std::string* server_protos,
     NetLog::LogLevel /* log_level */) {
   base::DictionaryValue* dict = new base::DictionaryValue();
 
   dict->SetString("next_proto_status",
                   SSLClientSocket::NextProtoStatusToString(status));
   dict->SetString("proto", *proto);
-  dict->SetString("server_protos",
-                  SSLClientSocket::ServerProtosToString(*server_protos));
   return dict;
 }
 
@@ -923,16 +920,15 @@ int HttpStreamFactoryImpl::Job::DoInitConnectionComplete(int result) {
       if (ssl_socket->WasNpnNegotiated()) {
         was_npn_negotiated_ = true;
         std::string proto;
-        std::string server_protos;
         SSLClientSocket::NextProtoStatus status =
-            ssl_socket->GetNextProto(&proto, &server_protos);
+            ssl_socket->GetNextProto(&proto);
         NextProto protocol_negotiated =
             SSLClientSocket::NextProtoFromString(proto);
         protocol_negotiated_ = protocol_negotiated;
         net_log_.AddEvent(
             NetLog::TYPE_HTTP_STREAM_REQUEST_PROTO,
             base::Bind(&NetLogHttpStreamProtoCallback,
-                       status, &proto, &server_protos));
+                       status, &proto));
         if (ssl_socket->was_spdy_negotiated())
           SwitchToSpdyMode();
       }