Fixes the remaining net_unittests for OpenSSL, with the exceptions

net/socket/ssl_client_socket_openssl.h

Index: 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 e7bfe3c2fa52b95385c217a23f6a1ecb023a54f6..99e92f2c04519d8a6d662bd24cb3ceaf11241c06 100644
--- a/net/socket/ssl_client_socket_openssl.h
+++ b/net/socket/ssl_client_socket_openssl.h
@@ -15,7 +15,9 @@
 #include "net/socket/client_socket_handle.h"
 
 typedef struct bio_st BIO;
+typedef struct evp_pkey_st EVP_PKEY;
 typedef struct ssl_st SSL;
+typedef struct x509_st X509;
 
 namespace net {
 
@@ -38,6 +40,10 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
 
   const HostPortPair& host_and_port() const { return host_and_port_; }
 
+  // Callback from the SSL layer that indicates the remote server is requesting
+  // a certificate for this client.
+  int ClientCertRequestCallback(SSL* ssl, X509** x509, EVP_PKEY** pkey);

[wtc, 2010/12/01 22:50:05]

Nit: match the method declaration and definition orders in
.h and .cc files:

http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Declaration_Order

[joth, 2010/12/02 17:12:01]

Done as near as I can.
The .cc has slipped quite a way out of order (in fact, never was in order) and
I'm reluctant to do a major re-ordering right now as I know several other people
have got sizable patches pending on this file and I don't want to disrupt them
more than necessary.

[wtc, 2010/12/03 18:56:05]

YES!  This is the right call.  Do not make gratuitous reorderings
merely to comply with this Style Guide recommendation.

I suggested matching declaration and definition orders because
you were adding a new method.  I didn't mean to ask you to fix
the ordering of existing code.

+
   // SSLClientSocket methods:
   virtual void GetSSLInfo(SSLInfo* ssl_info);
   virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);
@@ -71,7 +77,6 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   int DoVerifyCert(int result);
   int DoVerifyCertComplete(int result);
   void DoConnectCallback(int result);
-  void InvalidateSessionIfBadCertificate();
   X509Certificate* UpdateServerCert();
 
   void OnHandshakeIOComplete(int result);