Use new BoringSSL scopers in //components.

components/webcrypto/algorithms/asymmetric_key_util.h

Index: components/webcrypto/algorithms/asymmetric_key_util.h
diff --git a/components/webcrypto/algorithms/asymmetric_key_util.h b/components/webcrypto/algorithms/asymmetric_key_util.h
index ee067b0eed73153844b02e2d619c1fc91d78bc4d..65dd55f4fb2ed928b19066fa729a56f36b892c6a 100644
--- a/components/webcrypto/algorithms/asymmetric_key_util.h
+++ b/components/webcrypto/algorithms/asymmetric_key_util.h
@@ -5,7 +5,8 @@
 #ifndef COMPONENTS_WEBCRYPTO_ALGORITHMS_ASYMMETRIC_KEY_UTIL_
 #define COMPONENTS_WEBCRYPTO_ALGORITHMS_ASYMMETRIC_KEY_UTIL_
 
-#include "crypto/scoped_openssl_types.h"
+#include <openssl/base.h>
+
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h"
 #include "third_party/WebKit/public/platform/WebCryptoKey.h"
 
@@ -18,7 +19,7 @@ class Status;
 
 // Creates a WebCrypto public key given an EVP_PKEY. This step includes
 // exporting the key to SPKI format, for use by serialization later.
-Status CreateWebCryptoPublicKey(crypto::ScopedEVP_PKEY public_key,
+Status CreateWebCryptoPublicKey(bssl::UniquePtr<EVP_PKEY> public_key,
                                 const blink::WebCryptoKeyAlgorithm& algorithm,
                                 bool extractable,
                                 blink::WebCryptoKeyUsageMask usages,
@@ -26,7 +27,7 @@ Status CreateWebCryptoPublicKey(crypto::ScopedEVP_PKEY public_key,
 
 // Creates a WebCrypto private key given an EVP_PKEY. This step includes
 // exporting the key to PKCS8 format, for use by serialization later.
-Status CreateWebCryptoPrivateKey(crypto::ScopedEVP_PKEY private_key,
+Status CreateWebCryptoPrivateKey(bssl::UniquePtr<EVP_PKEY> private_key,
                                  const blink::WebCryptoKeyAlgorithm& algorithm,
                                  bool extractable,
                                  blink::WebCryptoKeyUsageMask usages,
@@ -38,7 +39,7 @@ Status CreateWebCryptoPrivateKey(crypto::ScopedEVP_PKEY private_key,
 // the key type matched |expected_pkey_id|.
 Status ImportUnverifiedPkeyFromSpki(const CryptoData& key_data,
                                     int expected_pkey_id,
-                                    crypto::ScopedEVP_PKEY* pkey);
+                                    bssl::UniquePtr<EVP_PKEY>* pkey);
 
 // Imports PKCS8 bytes to an EVP_PKEY for a private key. The resulting
 // asymmetric key may be invalid, and should be verified using something like
@@ -46,7 +47,7 @@ Status ImportUnverifiedPkeyFromSpki(const CryptoData& key_data,
 // the key type matched |expected_pkey_id|.
 Status ImportUnverifiedPkeyFromPkcs8(const CryptoData& key_data,
                                      int expected_pkey_id,
-                                     crypto::ScopedEVP_PKEY* pkey);
+                                     bssl::UniquePtr<EVP_PKEY>* pkey);
 
 // Splits the combined usages given to GenerateKey() into the respective usages
 // for the public key and private key. Returns an error if the usages are