Convert crypto::ScopedOpenSSL to type aliases.

content/child/webcrypto/openssl/util_openssl.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 "content/child/webcrypto/openssl/util_openssl.h"
 
 #include <openssl/evp.h>
 #include <openssl/pkcs12.h>
 #include <openssl/rand.h>
 
@@ skipping 83 matching lines @@
   EVP_AEAD_CTX ctx;
 
   if (!aead_alg)
     return Status::ErrorUnexpected();
 
   if (!EVP_AEAD_CTX_init(&ctx, aead_alg, vector_as_array(&raw_key),
                          raw_key.size(), tag_length_bytes, NULL)) {
     return Status::OperationError();
   }
 
-  crypto::ScopedOpenSSL<EVP_AEAD_CTX, EVP_AEAD_CTX_cleanup>::Type ctx_cleanup(
-      &ctx);
+  crypto::ScopedOpenSSL<EVP_AEAD_CTX, EVP_AEAD_CTX_cleanup> ctx_cleanup(&ctx);
 
   size_t len;
   int ok;
 
   if (mode == DECRYPT) {
     if (data.byte_length() < tag_length_bytes)
       return Status::ErrorDataTooSmall();
 
     buffer->resize(data.byte_length() - tag_length_bytes);
 
@@ skipping 103 matching lines @@
 
   return Status::Success();
 }
 
 Status ImportUnverifiedPkeyFromPkcs8(const CryptoData& key_data,
                                      int expected_pkey_id,
                                      crypto::ScopedEVP_PKEY* pkey) {
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
   const uint8_t* ptr = key_data.bytes();
-  crypto::ScopedOpenSSL<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free>::Type
-      p8inf(d2i_PKCS8_PRIV_KEY_INFO(nullptr, &ptr, key_data.byte_length()));
+  crypto::ScopedOpenSSL<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free> p8inf(
+      d2i_PKCS8_PRIV_KEY_INFO(nullptr, &ptr, key_data.byte_length()));
   if (!p8inf.get() || ptr != key_data.bytes() + key_data.byte_length())
     return Status::DataError();
 
   pkey->reset(EVP_PKCS82PKEY(p8inf.get()));
   if (!pkey->get())
     return Status::DataError();
 
   if (EVP_PKEY_id(pkey->get()) != expected_pkey_id)
     return Status::DataError();  // Data did not define expected key type.
 
   return Status::Success();
 }
 
 BIGNUM* CreateBIGNUM(const std::string& n) {
   return BN_bin2bn(reinterpret_cast<const uint8_t*>(n.data()), n.size(), NULL);
 }
 
 std::vector<uint8_t> BIGNUMToVector(const BIGNUM* n) {
   std::vector<uint8_t> v(BN_num_bytes(n));
   BN_bn2bin(n, vector_as_array(&v));
   return v;
 }
 
 }  // namespace webcrypto
 
 }  // namespace content