Report curve types in ECDSA SSLPrivateKeys.

net/android/keystore.cc

Index: net/android/keystore.cc
diff --git a/net/android/keystore.cc b/net/android/keystore.cc
index d2246103e661330f4ab82afe2703b312aa83d541..91ee41e1a5d47dccadbc632f013856c6fd54f967 100644
--- a/net/android/keystore.cc
+++ b/net/android/keystore.cc
@@ -13,7 +13,6 @@
 
 using base::android::AttachCurrentThread;
 using base::android::HasException;
-using base::android::JavaArrayOfByteArrayToStringVector;
 using base::android::JavaByteArrayToByteVector;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
@@ -22,33 +21,6 @@ using base::android::ToJavaByteArray;
 namespace net {
 namespace android {
 
-bool GetRSAKeyModulus(const JavaRef<jobject>& private_key_ref,
-                      std::vector<uint8_t>* result) {
-  JNIEnv* env = AttachCurrentThread();
-
-  ScopedJavaLocalRef<jbyteArray> modulus_ref =
-      Java_AndroidKeyStore_getRSAKeyModulus(env, private_key_ref);
-  if (modulus_ref.is_null())
-    return false;
-
-  JavaByteArrayToByteVector(env, modulus_ref.obj(), result);
-  return true;
-}
-
-bool GetECKeyOrder(const JavaRef<jobject>& private_key_ref,
-                   std::vector<uint8_t>* result) {
-  JNIEnv* env = AttachCurrentThread();
-
-  ScopedJavaLocalRef<jbyteArray> order_ref =
-      Java_AndroidKeyStore_getECKeyOrder(env, private_key_ref);
-
-  if (order_ref.is_null())
-    return false;
-
-  JavaByteArrayToByteVector(env, order_ref.obj(), result);
-  return true;
-}
-
 bool RawSignDigestWithPrivateKey(const JavaRef<jobject>& private_key_ref,
                                  const base::StringPiece& digest,
                                  std::vector<uint8_t>* signature) {
@@ -71,12 +43,6 @@ bool RawSignDigestWithPrivateKey(const JavaRef<jobject>& private_key_ref,
   return true;
 }
 
-PrivateKeyType GetPrivateKeyType(const JavaRef<jobject>& private_key_ref) {
-  JNIEnv* env = AttachCurrentThread();
-  int type = Java_AndroidKeyStore_getPrivateKeyType(env, private_key_ref);
-  return static_cast<PrivateKeyType>(type);
-}
-
 AndroidEVP_PKEY* GetOpenSSLSystemHandleForPrivateKey(
     const JavaRef<jobject>& private_key_ref) {
   JNIEnv* env = AttachCurrentThread();