net: rework the NPN patch.

net/socket/ssl_client_socket_nss.h

Index: net/socket/ssl_client_socket_nss.h
diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h
index 4cc681a66c4b59e817201da305701c6595b5053c..3e2de55887df4e1496202efb971a072dccc47a1e 100644
--- a/net/socket/ssl_client_socket_nss.h
+++ b/net/socket/ssl_client_socket_nss.h
@@ -188,6 +188,13 @@ class SSLClientSocketNSS : public SSLClientSocket {
   // argument.
   static void HandshakeCallback(PRFileDesc* socket, void* arg);
 
+  static SECStatus NextProtoCallback(void* arg,
+                                     PRFileDesc* fd,
+                                     const unsigned char* protos,
+                                     unsigned short protos_len,
+                                     unsigned char* proto_out,
+                                     unsigned char* proto_out_len);
+
   // The following methods are for debugging bug 65948. Will remove this code
   // after fixing bug 65948.
   void EnsureThreadIdAssigned() const;
@@ -285,6 +292,10 @@ class SSLClientSocketNSS : public SSLClientSocket {
   scoped_ptr<SSLHostInfo> ssl_host_info_;
   DnsCertProvenanceChecker* const dns_cert_checker_;
 
+  // next_proto is the protocol that we selected by NPN.

[wtc, 2011/10/05 23:34:25]

Typo: next_proto => next_proto_

[agl, 2011/10/07 19:19:17]

Done.

+  std::string next_proto_;
+  NextProtoStatus next_proto_status_;
+
   // The following two variables are added for debugging bug 65948. Will
   // remove this code after fixing bug 65948.
   // Added the following code Debugging in release mode.