Use new BoringSSL scopers in //components.

components/webcrypto/algorithms/aes_cbc.cc

 // Copyright 2014 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 <openssl/aes.h>
-#include <openssl/evp.h>
+#include <openssl/cipher.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/numerics/safe_math.h"
 #include "components/webcrypto/algorithms/aes.h"
 #include "components/webcrypto/algorithms/util.h"
 #include "components/webcrypto/blink_key_handle.h"
 #include "components/webcrypto/crypto_data.h"
 #include "components/webcrypto/status.h"
 #include "crypto/openssl_util.h"
-#include "crypto/scoped_openssl_types.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
 
 namespace webcrypto {
 
 namespace {
 
 const EVP_CIPHER* GetAESCipherByKeyLength(size_t key_length_bytes) {
   // 192-bit AES is intentionally unsupported (http://crbug.com/533699).
   switch (key_length_bytes) {
     case 16:
@@ skipping 26 matching lines @@
   if (!output_max_len.IsValid())
     return Status::ErrorDataTooLarge();
 
   const unsigned remainder = output_max_len.ValueOrDie() % AES_BLOCK_SIZE;
   if (remainder != 0)
     output_max_len += AES_BLOCK_SIZE - remainder;
   if (!output_max_len.IsValid())
     return Status::ErrorDataTooLarge();
 
   // Note: PKCS padding is enabled by default
-  crypto::ScopedOpenSSL<EVP_CIPHER_CTX, EVP_CIPHER_CTX_free> context(
-      EVP_CIPHER_CTX_new());
-
-  if (!context.get())
-    return Status::OperationError();
-
   const EVP_CIPHER* const cipher = GetAESCipherByKeyLength(raw_key.size());
   DCHECK(cipher);
 
+  bssl::ScopedEVP_CIPHER_CTX context;
   if (!EVP_CipherInit_ex(context.get(), cipher, NULL, &raw_key[0],
                          params->iv().data(), cipher_operation)) {
     return Status::OperationError();
   }
 
   buffer->resize(output_max_len.ValueOrDie());
 
   int output_len = 0;
   if (!EVP_CipherUpdate(context.get(), buffer->data(), &output_len,
                         data.bytes(), data.byte_length())) {
@@ skipping 33 matching lines @@
   }
 };
 
 }  // namespace
 
 std::unique_ptr<AlgorithmImplementation> CreateAesCbcImplementation() {
   return base::WrapUnique(new AesCbcImplementation);
 }
 
 }  // namespace webcrypto