Convert crypto::ScopedOpenSSL to type aliases.

net/cert/x509_util_openssl_unittest.cc

 // Copyright (c) 2012 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 "base/memory/scoped_ptr.h"
 #include "crypto/ec_private_key.h"
 #include "crypto/openssl_util.h"
 #include "crypto/scoped_openssl_types.h"
 #include "net/cert/x509_util.h"
 #include "net/cert/x509_util_openssl.h"
@@ skipping 28 matching lines @@
   EXPECT_EQ(1, X509_verify(cert.get(), pub_key.get()));
 }
 
 // Verify the attributes of a domain-bound certificate.
 // |domain| is the bound domain name.
 // |der_cert| is the DER-encoded X.509 certificate.
 void VerifyChannelID(const std::string& domain,
                      const std::string& der_cert) {
   // Origin Bound Cert OID.
   static const char oid_string[] = "1.3.6.1.4.1.11129.2.1.6";
-  crypto::ScopedOpenSSL<ASN1_OBJECT, ASN1_OBJECT_free>::Type oid_obj(
+  crypto::ScopedOpenSSL<ASN1_OBJECT, ASN1_OBJECT_free> oid_obj(
       OBJ_txt2obj(oid_string, 0));
   ASSERT_TRUE(oid_obj.get());
 
   const unsigned char* cert_data =
       reinterpret_cast<const unsigned char*>(der_cert.data());
   int cert_data_len = static_cast<int>(der_cert.size());
   ScopedX509 cert(d2i_X509(NULL, &cert_data, cert_data_len));
   ASSERT_TRUE(cert.get());
 
   // Find the extension.
@@ skipping 70 matching lines @@
 
   VerifyChannelID(domain, der_cert);
 
   // signature_verifier_win and signature_verifier_mac can't handle EC certs.
   std::vector<uint8> spki;
   ASSERT_TRUE(private_key->ExportPublicKey(&spki));
   VerifyCertificateSignature(der_cert, spki);
 }
 
 }  // namespace net