Eliminate ScopedOpenSSL in favour of scoped_ptr<> specializations.

net/socket/ssl_server_socket_openssl.cc

 // Copyright (c) 2012 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_server_socket_openssl.h"
 
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "crypto/openssl_util.h"
 #include "crypto/rsa_private_key.h"
+#include "crypto/scoped_openssl_types.h"
 #include "net/base/net_errors.h"
 #include "net/socket/openssl_ssl_util.h"
 #include "net/socket/ssl_error_params.h"
 
 #define GotoState(s) next_handshake_state_ = s
 
 namespace net {
 
 void EnableSSLServerSockets() {
   // No-op because CreateSSLServerSocket() calls crypto::EnsureOpenSSLInit().
@@ skipping 567 matching lines @@
   user_write_buf_len_ = 0;
   ResetAndReturn(&user_write_callback_).Run(rv);
 }
 
 int SSLServerSocketOpenSSL::Init() {
   DCHECK(!ssl_);
   DCHECK(!transport_bio_);
 
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
-  crypto::ScopedOpenSSL<SSL_CTX, SSL_CTX_free> ssl_ctx(
+  crypto::ScopedOpenSSL<SSL_CTX, SSL_CTX_free>::Type ssl_ctx(
       // It support SSLv2, SSLv3, and TLSv1.
       SSL_CTX_new(SSLv23_server_method()));
   ssl_ = SSL_new(ssl_ctx.get());
   if (!ssl_)
     return ERR_UNEXPECTED;
 
   BIO* ssl_bio = NULL;
   // 0 => use default buffer sizes.
   if (!BIO_new_bio_pair(&ssl_bio, 0, &transport_bio_, 0))
     return ERR_UNEXPECTED;
@@ skipping 11 matching lines @@
   }
 #else
   // Convert OSCertHandle to X509 structure.
   std::string der_string;
   if (!X509Certificate::GetDEREncoded(cert_->os_cert_handle(), &der_string))
     return ERR_UNEXPECTED;
 
   const unsigned char* der_string_array =
       reinterpret_cast<const unsigned char*>(der_string.data());
 
-  crypto::ScopedOpenSSL<X509, X509_free>
-      x509(d2i_X509(NULL, &der_string_array, der_string.length()));
+  crypto::ScopedOpenSSL<X509, X509_free>::Type x509(
+      d2i_X509(NULL, &der_string_array, der_string.length()));
   if (!x509.get())
     return ERR_UNEXPECTED;
 
   // On success, SSL_use_certificate acquires a reference to |x509|.
   if (SSL_use_certificate(ssl_, x509.get()) != 1) {
     LOG(ERROR) << "Cannot set certificate.";
     return ERR_UNEXPECTED;
   }
 #endif  // USE_OPENSSL_CERTS
 
@@ skipping 31 matching lines @@
 
   mode.ConfigureFlag(SSL_MODE_RELEASE_BUFFERS, true);
 
   SSL_set_mode(ssl_, mode.set_mask);
   SSL_clear_mode(ssl_, mode.clear_mask);
 
   return OK;
 }
 
 }  // namespace net