Remove Android support for out-of-process KeyStores

android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java

Index: android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java b/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
index 9925882979ab35256bf9eb7e9397abf14adb78ea..244dfedbdbc6975bb913352eb952cdddb838a3b5 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
@@ -8,7 +8,6 @@ import android.content.Context;
 import android.content.SharedPreferences;
 
 import org.chromium.content.browser.ContentViewStatics;
-import org.chromium.net.DefaultAndroidKeyStore;
 
 /**
  * Java side of the Browser Context: contains all the java side objects needed to host one
@@ -20,12 +19,11 @@ import org.chromium.net.DefaultAndroidKeyStore;
 public class AwBrowserContext {
     private static final String HTTP_AUTH_DATABASE_FILE = "http_auth.db";
 
-    private SharedPreferences mSharedPreferences;
+    private final SharedPreferences mSharedPreferences;
 
     private AwGeolocationPermissions mGeolocationPermissions;
     private AwFormDatabase mFormDatabase;
     private HttpAuthDatabase mHttpAuthDatabase;
-    private DefaultAndroidKeyStore mLocalKeyStore;
     private AwMessagePortService mMessagePortService;
 
     public AwBrowserContext(SharedPreferences sharedPreferences, Context applicationContext) {
@@ -53,13 +51,6 @@ public class AwBrowserContext {
         return mHttpAuthDatabase;
     }
 
-    public DefaultAndroidKeyStore getKeyStore() {
-        if (mLocalKeyStore == null) {
-            mLocalKeyStore = new DefaultAndroidKeyStore();
-        }
-        return mLocalKeyStore;
-    }
-
     public AwMessagePortService getMessagePortService() {
         if (mMessagePortService == null) {
             mMessagePortService = new AwMessagePortService();