Remove Android support for out-of-process KeyStores

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

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
index 92bcd1cb25f07012974916888267736947cd7034..f2aee2a4d3bdf401153431dc93765ec5f710aef3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
@@ -82,8 +82,6 @@ import org.chromium.chrome.browser.services.AccountsChangedReceiver;
 import org.chromium.chrome.browser.services.AndroidEduOwnerCheckCallback;
 import org.chromium.chrome.browser.services.GoogleServicesManager;
 import org.chromium.chrome.browser.share.ShareHelper;
-import org.chromium.chrome.browser.smartcard.EmptyPKCS11AuthenticationManager;
-import org.chromium.chrome.browser.smartcard.PKCS11AuthenticationManager;
 import org.chromium.chrome.browser.sync.GmsCoreSyncListener;
 import org.chromium.chrome.browser.sync.SyncController;
 import org.chromium.chrome.browser.tab.AuthenticatorNavigationInterceptor;
@@ -451,8 +449,6 @@ public class ChromeApplication extends ContentApplication {
         GoogleServicesManager.get(this).onMainActivityStart();
         RevenueStats.getInstance();
 
-        getPKCS11AuthenticationManager().initialize(ChromeApplication.this);
-
         mDevToolsServer = new DevToolsServer(DEV_TOOLS_SERVER_SOCKET_PREFIX);
         mDevToolsServer.setRemoteDebuggingEnabled(
                 true, DevToolsServer.Security.ALLOW_DEBUG_PERMISSION);
@@ -597,12 +593,6 @@ public class ChromeApplication extends ContentApplication {
         return PartnerBrowserCustomizations.isIncognitoDisabled();
     }
 
-    // TODO(yfriedman): This is too widely available. Plumb this through ChromeNetworkDelegate
-    // instead.
-    protected PKCS11AuthenticationManager getPKCS11AuthenticationManager() {
-        return EmptyPKCS11AuthenticationManager.getInstance();
-    }
-
     /**
      * @return A provider of external estimates.
      * @param nativePtr Pointer to the native ExternalEstimateProviderAndroid object.