Refactoring AndroidKeyStore to support a KeyStore running in another process

chrome/android/java/src/org/chromium/chrome/browser/PKCS11AuthenticationManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/PKCS11AuthenticationManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/PKCS11AuthenticationManager.java b/chrome/android/java/src/org/chromium/chrome/browser/PKCS11AuthenticationManager.java
index e3fd43699625ef90a1019cfc6f916de1594732f3..8e57a70a587cee08784d6361b73c393830b3d77e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/PKCS11AuthenticationManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/PKCS11AuthenticationManager.java
@@ -6,7 +6,8 @@ package org.chromium.chrome.browser;
 
 import android.content.Context;
 
-import java.security.PrivateKey;
+import org.chromium.net.AndroidPrivateKey;
+
 import java.security.cert.X509Certificate;
 
 /**
@@ -34,13 +35,13 @@ public interface PKCS11AuthenticationManager {
     public X509Certificate[] getCertificateChain(String alias);
 
     /**
-     * Returns the PrivateKey for the requested alias, or null if no there is no result.
-     */
-    public PrivateKey getPrivateKey(String alias);
-
-    /**
      * Performs necessary initializing for using a PKCS11-based KeysStore. Note that this can
      * perform expensive operations and cannot be done on the UI thread.
      */
     public void initialize(Context context);
+
+    /**
+     * Returns the AndroidPrivateKey for the requested alias, or null if there is no result.
+     */
+    public AndroidPrivateKey getPrivateKey(String alias);
 }