Remove SSLPrivateKey metadata hooks.

net/ssl/ssl_platform_key_android_unittest.cc

 // Copyright (c) 2013 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_android.h"
 
 #include <string>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 30 matching lines @@
           env, reinterpret_cast<const uint8_t*>(pkcs8_key.data()),
           pkcs8_key.size()));
 
   ScopedJava key(Java_AndroidKeyStoreTestUtil_createPrivateKeyFromPKCS8(
       env, key_type, bytes));
 
   return key;
 }
 
 struct TestKey {
+  const char* name;
   const char* cert_file;
   const char* key_file;
   android::PrivateKeyType android_key_type;
-  SSLPrivateKey::Type key_type;
 };
 
 const TestKey kTestKeys[] = {
-    {"client_1.pem", "client_1.pk8", android::PRIVATE_KEY_TYPE_RSA,
-     SSLPrivateKey::Type::RSA},
-    {"client_4.pem", "client_4.pk8", android::PRIVATE_KEY_TYPE_ECDSA,
-     SSLPrivateKey::Type::ECDSA_P256},
-    {"client_5.pem", "client_5.pk8", android::PRIVATE_KEY_TYPE_ECDSA,
-     SSLPrivateKey::Type::ECDSA_P384},
-    {"client_6.pem", "client_6.pk8", android::PRIVATE_KEY_TYPE_ECDSA,
-     SSLPrivateKey::Type::ECDSA_P521},
+    {"RSA", "client_1.pem", "client_1.pk8", android::PRIVATE_KEY_TYPE_RSA},
+    {"ECDSA_P256", "client_4.pem", "client_4.pk8",
+     android::PRIVATE_KEY_TYPE_ECDSA},
+    {"ECDSA_P384", "client_5.pem", "client_5.pk8",
+     android::PRIVATE_KEY_TYPE_ECDSA},
+    {"ECDSA_P521", "client_6.pem", "client_6.pk8",
+     android::PRIVATE_KEY_TYPE_ECDSA},
 };
 
 std::string TestKeyToString(const testing::TestParamInfo<TestKey>& params) {
-  return SSLPrivateKeyTypeToString(params.param.key_type);
+  return params.param.name;
 }
 
 }  // namespace
 
 class SSLPlatformKeyAndroidTest : public testing::TestWithParam<TestKey> {};
 
 TEST_P(SSLPlatformKeyAndroidTest, Matches) {
   const TestKey& test_key = GetParam();
 
   scoped_refptr<X509Certificate> cert =
@@ skipping 18 matching lines @@
 
   TestSSLPrivateKeyMatches(key.get(), key_bytes);
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         SSLPlatformKeyAndroidTest,
                         testing::ValuesIn(kTestKeys),
                         TestKeyToString);
 
 }  // namespace net