commit 55e973d09a29ed6e79bb72c506588ce161b34cc6
author rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Mon Dec 05 23:03:24 2011
committer rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Mon Dec 05 23:03:24 2011
tree 96bf8c3737f1b1a4ff60f0fd26ce6cb5361c1482
parent 93ebb45a57cd9cc89622dda27ed00809eee0d1d4

Log server advertised protos and the selected
next_proto to net-internals log.

In net internal logs, we will log proto in the following
manner:

(P) t=1323112212350 [st=463]     
    HTTP_STREAM_REQUEST_PROTO             
        --> next_proto_status = "negotiated"
        --> proto = "spdy/2"                
        --> server_protos = "spdy/2,http/1.1"

BUG=62064
TEST=network unit tests
R=willchan

The following was the original CL:
http://codereview.chromium.org/8676046/
Review URL: http://codereview.chromium.org/8787011

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

net/socket/ssl_client_socket_openssl.h

diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h
index a09fff4..281bb1ce 100644
--- a/net/socket/ssl_client_socket_openssl.h
+++ b/net/socket/ssl_client_socket_openssl.h
@@ -59,7 +59,8 @@
                                    const base::StringPiece& context,
                                    unsigned char *out,
                                    unsigned int outlen);
-  virtual NextProtoStatus GetNextProto(std::string* proto);
+  virtual NextProtoStatus GetNextProto(std::string* proto,
+                                       std::string* server_protos);
 
   // StreamSocket methods:
   virtual int Connect(OldCompletionCallback* callback);
@@ -163,6 +164,7 @@
   State next_handshake_state_;
   NextProtoStatus npn_status_;
   std::string npn_proto_;
+  std::string server_protos_;
   BoundNetLog net_log_;
 };