Eliminate ScopedOpenSSL in favour of scoped_ptr<> specializations.

net/base/openssl_private_key_store_android.cc

Index: net/base/openssl_private_key_store_android.cc
diff --git a/net/base/openssl_private_key_store_android.cc b/net/base/openssl_private_key_store_android.cc
index e9851077faa836140dd94c645ae2e2e63ef17bbd..824b0a9b9ea92246d37155d4599e460b6fec1a35 100644
--- a/net/base/openssl_private_key_store_android.cc
+++ b/net/base/openssl_private_key_store_android.cc
@@ -10,6 +10,7 @@
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "crypto/openssl_util.h"
+#include "crypto/scoped_openssl_types.h"
 #include "net/android/network_library.h"
 
 namespace net {
@@ -29,9 +30,10 @@ bool OpenSSLPrivateKeyStore::StoreKeyPair(const GURL& url,
   // in a format that is incompatible with what the platform expects.
   unsigned char* private_key = NULL;
   int private_len = 0;
-  crypto::ScopedOpenSSL<
-      PKCS8_PRIV_KEY_INFO,
-      PKCS8_PRIV_KEY_INFO_free> pkcs8(EVP_PKEY2PKCS8(pkey));
+  scoped_ptr<PKCS8_PRIV_KEY_INFO,
+             crypto::OpenSSLDestroyer<PKCS8_PRIV_KEY_INFO,
+                                      PKCS8_PRIV_KEY_INFO_free> >
+      pkcs8(EVP_PKEY2PKCS8(pkey));
   if (pkcs8.get() != NULL) {
     private_len = i2d_PKCS8_PRIV_KEY_INFO(pkcs8.get(), &private_key);
   }