Eliminate ScopedOpenSSL in favour of scoped_ptr<> specializations.

net/socket/ssl_session_cache_openssl_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/ssl_session_cache_openssl.h"
 
 #include <openssl/ssl.h>
 
 #include "base/lazy_instance.h"
 #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"
 
 // This is an internal OpenSSL function that can be used to create a new
 // session for an existing SSL object. This shall force a call to the
 // 'generate_session_id' callback from the SSL's session context.
 // |s| is the target SSL connection handle.
 // |session| is non-0 to ask for the creation of a new session. If 0,
 // this will set an empty session with no ID instead.
 extern "C" int ssl_get_new_session(SSL* s, int session);
 
 // This is an internal OpenSSL function which is used internally to add
 // a new session to the cache. It is normally triggered by a succesful
 // connection. However, this unit test does not use the network at all.
 extern "C" void ssl_update_cache(SSL* s, int mode);
 
 namespace net {
 
 namespace {
 
-typedef crypto::ScopedOpenSSL<SSL, SSL_free> ScopedSSL;
+typedef crypto::ScopedOpenSSL<SSL, SSL_free>::Type ScopedSSL;
+typedef crypto::ScopedOpenSSL<SSL_CTX, SSL_CTX_free>::Type ScopedSSL_CTX;
 
 // Helper class used to associate arbitrary std::string keys with SSL objects.
 class SSLKeyHelper {
  public:
   // Return the string associated with a given SSL handle |ssl|, or the
   // empty string if none exists.
   static std::string Get(const SSL* ssl) {
     return GetInstance()->GetValue(ssl);
   }
 
@@ skipping 91 matching lines @@
   static void ResetSessionID(SSL* ssl) { ssl_get_new_session(ssl, 1); }
 
   // Add a given SSL object and its session to the cache.
   void AddToCache(SSL* ssl) {
     ssl_update_cache(ssl, ctx_.get()->session_cache_mode);
   }
 
   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_;
 };
 
 // static
 const SSLSessionCacheOpenSSL::Config
     SSLSessionCacheOpenSSLTest::kDefaultConfig = {
         &SSLKeyHelper::Get,  // key_func
         1024,                // max_entries
         256,                 // expiration_check_count
@@ skipping 213 matching lines @@
 
   // Call SetSSLSession another time, this shall expire all sessions except
   // the last one.
   ScopedSSL bad_ssl(NewSSL("unknown-key"));
   cache_.SetSSLSession(bad_ssl.get());
   bad_ssl.reset(NULL);
   EXPECT_EQ(1U, cache_.size());
 }
 
 }  // namespace net