Switch OpenSSLClientKeyStore::ScopedEVP_PKEY to crypto::ScopedEVP_PKEY.

net/ssl/openssl_client_key_store.h

Index: net/ssl/openssl_client_key_store.h
diff --git a/net/ssl/openssl_client_key_store.h b/net/ssl/openssl_client_key_store.h
index e2b57a37fc7a610cd5473ef6a9bc8189d8af9a0a..d1d09c4176c8ccdd50fca61926691631b816025c 100644
--- a/net/ssl/openssl_client_key_store.h
+++ b/net/ssl/openssl_client_key_store.h
@@ -13,6 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "crypto/openssl_util.h"
+#include "crypto/scoped_openssl_types.h"
 #include "net/base/net_export.h"
 
 namespace net {
@@ -31,14 +32,6 @@ class NET_EXPORT OpenSSLClientKeyStore {
   // Platforms must define this factory function as appropriate.
   static OpenSSLClientKeyStore* GetInstance();
 
-  struct EVP_PKEY_Deleter {
-    inline void operator()(EVP_PKEY* ptr) const {
-      EVP_PKEY_free(ptr);
-    }
-  };
-
-  typedef scoped_ptr<EVP_PKEY, EVP_PKEY_Deleter> ScopedEVP_PKEY;
-
   // Record the association between a certificate and its
   // private key. This method should be called _before_
   // FetchClientCertPrivateKey to ensure that the private key is returned
@@ -60,7 +53,7 @@ class NET_EXPORT OpenSSLClientKeyStore {
   // Returns true on success, false otherwise. This increments the reference
   // count of the private key on success.
   bool FetchClientCertPrivateKey(const X509Certificate* cert,
-                                 ScopedEVP_PKEY* private_key);
+                                 crypto::ScopedEVP_PKEY* private_key);
 
   // Flush all recorded keys.
   void Flush();