Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / net / socket / ssl_session_cache_openssl_unittest.cc

diff --git a/src/net/socket/ssl_session_cache_openssl_unittest.cc b/src/net/socket/ssl_session_cache_openssl_unittest.cc
index 22c4fba..54b1e3b 100644 (file)
--- a/src/net/socket/ssl_session_cache_openssl_unittest.cc
+++ b/src/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,8 @@ 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 {
@@ -73,8 +75,8 @@ class SSLKeyHelper {
   // Called when an SSL object is copied through SSL_dup(). This needs to copy
   // the value as well.
   static int KeyDup(CRYPTO_EX_DATA* to,
-                    CRYPTO_EX_DATA* from,
-                    void* from_fd,
+                    const CRYPTO_EX_DATA* from,
+                    void** from_fd,
                     int idx,
                     long argl,
                     void* argp) {
@@ -142,7 +144,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_;
 };