Eliminate ScopedOpenSSL in favour of scoped_ptr<> specializations.

net/socket/ssl_session_cache_openssl_unittest.cc

Index: net/socket/ssl_session_cache_openssl_unittest.cc
diff --git a/net/socket/ssl_session_cache_openssl_unittest.cc b/net/socket/ssl_session_cache_openssl_unittest.cc
index 22c4fbaeb9ce505f8f6de447a3275325c183f876..07adc88c9ee780122812e37761a7ac323e5cff74 100644
--- a/net/socket/ssl_session_cache_openssl_unittest.cc
+++ b/net/socket/ssl_session_cache_openssl_unittest.cc
@@ -10,6 +10,7 @@
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "crypto/openssl_util.h"
+#include "crypto/scoped_openssl_types.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -30,7 +31,9 @@ namespace net {
 
 namespace {
 
-typedef crypto::ScopedOpenSSL<SSL, SSL_free> ScopedSSL;
+typedef scoped_ptr<SSL, crypto::OpenSSLDestroyer<SSL, SSL_free> > ScopedSSL;
+typedef scoped_ptr<SSL_CTX, crypto::OpenSSLDestroyer<SSL_CTX, SSL_CTX_free> >
+    ScopedSSL_CTX;
 
 // Helper class used to associate arbitrary std::string keys with SSL objects.
 class SSLKeyHelper {
@@ -142,7 +145,7 @@ class SSLSessionCacheOpenSSLTest : public testing::Test {
   static const SSLSessionCacheOpenSSL::Config kDefaultConfig;
 
  protected:
-  crypto::ScopedOpenSSL<SSL_CTX, SSL_CTX_free> ctx_;
+  ScopedSSL_CTX ctx_;
   // |cache_| must be destroyed before |ctx_| and thus appears after it.
   SSLSessionCacheOpenSSL cache_;
 };