Use new BoringSSL scopers in //components.

components/webcrypto/blink_key_handle.cc

 // Copyright 2015 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 "components/webcrypto/blink_key_handle.h"
 
+#include <openssl/evp.h>
+
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "components/webcrypto/crypto_data.h"
 #include "components/webcrypto/status.h"
 
 namespace webcrypto {
 
 namespace {
@@ skipping 43 matching lines @@
     return serialized_key_data();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SymKey);
 };
 
 class AsymKey : public Key {
  public:
   // After construction the |pkey| should NOT be mutated.
-  AsymKey(crypto::ScopedEVP_PKEY pkey,
+  AsymKey(bssl::UniquePtr<EVP_PKEY> pkey,
           const std::vector<uint8_t>& serialized_key_data)
       : Key(CryptoData(serialized_key_data)), pkey_(std::move(pkey)) {}
 
   AsymKey* AsAsymKey() override { return this; }
 
   // The caller should NOT mutate this EVP_PKEY.
   EVP_PKEY* pkey() { return pkey_.get(); }
 
  private:
-  crypto::ScopedEVP_PKEY pkey_;
+  bssl::UniquePtr<EVP_PKEY> pkey_;
 
   DISALLOW_COPY_AND_ASSIGN(AsymKey);
 };
 
 Key* GetKey(const blink::WebCryptoKey& key) {
   return reinterpret_cast<Key*>(key.handle());
 }
 
 }  // namespace
 
@@ skipping 12 matching lines @@
     const blink::WebCryptoKey& key) {
   return GetKey(key)->serialized_key_data();
 }
 
 blink::WebCryptoKeyHandle* CreateSymmetricKeyHandle(
     const CryptoData& key_bytes) {
   return new SymKey(key_bytes);
 }
 
 blink::WebCryptoKeyHandle* CreateAsymmetricKeyHandle(
-    crypto::ScopedEVP_PKEY pkey,
+    bssl::UniquePtr<EVP_PKEY> pkey,
     const std::vector<uint8_t>& serialized_key_data) {
   return new AsymKey(std::move(pkey), serialized_key_data);
 }
 
 }  // namespace webcrypto