Add support for OpenSSL Next Protocol Negotiation

net/socket/ssl_client_socket_openssl.h

Index: net/socket/ssl_client_socket_openssl.h
===================================================================
--- net/socket/ssl_client_socket_openssl.h	(revision 67990)
+++ net/socket/ssl_client_socket_openssl.h	(working copy)
@@ -6,6 +6,8 @@
 #define NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
 #pragma once
 
+#include <string>
+
 #include "base/scoped_ptr.h"
 #include "net/base/cert_verify_result.h"
 #include "net/base/completion_callback.h"
@@ -67,6 +69,11 @@
   virtual bool SetReceiveBufferSize(int32 size);
   virtual bool SetSendBufferSize(int32 size);
 
+  void set_npn_status(NextProtoStatus status) { npn_status_ = status; }

[joth, 2010/12/02 17:46:55]

could you put these up next to host_and_port(), as the section down here is for
virtual overrides.

[Kristian_, 2010/12/03 14:58:56]

Done, actually removed.

+  void set_npn_proto(const char* proto, int len) {
+    npn_proto_.assign(proto, len);
+  }
+
  private:
   bool Init();
   void DoReadCallback(int result);
@@ -146,6 +153,8 @@
     STATE_VERIFY_CERT_COMPLETE,
   };
   State next_handshake_state_;
+  NextProtoStatus npn_status_;
+  std::string npn_proto_;
   BoundNetLog net_log_;
 };