Remove Android support for out-of-process KeyStores

Support for out-of-process KeyStores was added to Chrome for Android
builds to support certain OEM-specific functionality. It worked by binding
to a service that implemented the RemoteAndroidKeyStoreInterface, and
using that for private key operations, rather than the default in-process
KeyStore.

However, support for this functionality in Chrome is being retired;
device manufacturers wishing to offer this functionality to Chrome
users can simply fall back to the default KeyStore implementation.

As such, remove the code and service descriptors; only local,
in-process KeyStores will be supported.

BUG=560614

Review URL: https://codereview.chromium.org/1474603004

Cr-Commit-Position: refs/heads/master@{#362649}

1 files changed, 2 insertions, 3 deletions

diff --git a/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java b/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
index a35427a..614ac79 100644
--- a/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
+++ b/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
@@ -24,7 +24,6 @@ public class AndroidKeyStoreTestUtil {
 
     private static final String TAG = "AndroidKeyStoreTestUtil";
 
-    private static final DefaultAndroidKeyStore sKeyStore = new DefaultAndroidKeyStore();
     /**
      * Called from native code to create a PrivateKey object from its
      * encoded PKCS#8 representation.
@@ -32,7 +31,7 @@ public class AndroidKeyStoreTestUtil {
      * @return new PrivateKey handle, or null in case of error.
      */
     @CalledByNative
-    public static AndroidPrivateKey createPrivateKeyFromPKCS8(int type, byte[] encodedKey) {
+    public static PrivateKey createPrivateKeyFromPKCS8(int type, byte[] encodedKey) {
         String algorithm = null;
         switch (type) {
             case PrivateKeyType.RSA:
@@ -49,7 +48,7 @@ public class AndroidKeyStoreTestUtil {
             KeyFactory factory = KeyFactory.getInstance(algorithm);
             KeySpec ks = new PKCS8EncodedKeySpec(encodedKey);
             PrivateKey key = factory.generatePrivate(ks);
-            return sKeyStore.createKey(key);
+            return key;
 
         } catch (NoSuchAlgorithmException e) {
             Log.e(TAG, "Could not create " + algorithm + " factory instance!");