Remove SSLPrivateKey metadata hooks.

net/ssl/ssl_platform_key_nss_unittest.cc

 // Copyright 2016 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 "net/ssl/ssl_platform_key.h"
 
 #include <keyhi.h>
 #include <pk11pub.h>
 #include <stdint.h>
 #include <string.h>
@@ skipping 17 matching lines @@
 #include "third_party/boringssl/src/include/openssl/ec.h"
 #include "third_party/boringssl/src/include/openssl/ec_key.h"
 #include "third_party/boringssl/src/include/openssl/evp.h"
 #include "third_party/boringssl/src/include/openssl/mem.h"
 
 namespace net {
 
 namespace {
 
 struct TestKey {
+  const char* name;
   const char* cert_file;
   const char* key_file;
-  SSLPrivateKey::Type key_type;
+  bool is_ecdsa;
 };
 
 const TestKey kTestKeys[] = {
-    {"client_1.pem", "client_1.pk8", SSLPrivateKey::Type::RSA},
-    {"client_4.pem", "client_4.pk8", SSLPrivateKey::Type::ECDSA_P256},
-    {"client_5.pem", "client_5.pk8", SSLPrivateKey::Type::ECDSA_P384},
-    {"client_6.pem", "client_6.pk8", SSLPrivateKey::Type::ECDSA_P521},
+    {"RSA", "client_1.pem", "client_1.pk8", false},
+    {"ECDSA_P256", "client_4.pem", "client_4.pk8", true},
+    {"ECDSA_P384", "client_5.pem", "client_5.pk8", true},
+    {"ECDSA_P521", "client_6.pem", "client_6.pk8", true},
 };
 
 std::string TestKeyToString(const testing::TestParamInfo<TestKey>& params) {
-  return SSLPrivateKeyTypeToString(params.param.key_type);
+  return params.param.name;
 }
 
 }  // namespace
 
 class SSLPlatformKeyNSSTest : public testing::TestWithParam<TestKey> {};
 
 TEST_P(SSLPlatformKeyNSSTest, KeyMatches) {
   const TestKey& test_key = GetParam();
 
   std::string pkcs8;
   base::FilePath pkcs8_path =
       GetTestCertsDirectory().AppendASCII(test_key.key_file);
   ASSERT_TRUE(base::ReadFileToString(pkcs8_path, &pkcs8));
 
   // Import the key into a test NSS database.
   crypto::ScopedTestNSSDB test_db;
   scoped_refptr<X509Certificate> cert;
-  if (SSLPrivateKey::IsECDSAType(test_key.key_type)) {
+  if (test_key.is_ecdsa) {
     // NSS cannot import unencrypted ECDSA keys, so we encrypt it with an empty
     // password and import manually.
     std::vector<uint8_t> pkcs8_vector(pkcs8.begin(), pkcs8.end());
     std::unique_ptr<crypto::ECPrivateKey> ec_private_key =
         crypto::ECPrivateKey::CreateFromPrivateKeyInfo(pkcs8_vector);
     ASSERT_TRUE(ec_private_key);
     std::vector<uint8_t> encrypted;
     ASSERT_TRUE(ec_private_key->ExportEncryptedPrivateKey(&encrypted));
 
     SECItem encrypted_item = {siBuffer, encrypted.data(),
@@ skipping 52 matching lines @@
 
   TestSSLPrivateKeyMatches(key.get(), pkcs8);
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         SSLPlatformKeyNSSTest,
                         testing::ValuesIn(kTestKeys),
                         TestKeyToString);
 
 }  // namespace net