Fix crash while trying to load client certificate

Provide default implementation for PKCS11AuthenticationManager to fix
null pointer crash. Clean-up client certificate api as now we use
chromium's implementation for the same.

Change-Id: I10c69b5d168e03ffb3fd9767bd17d5374e161111

2 files changed, 0 insertions, 23 deletions

diff --git a/tests/src/com/android/browser/PopularUrlsTest.java b/tests/src/com/android/browser/PopularUrlsTest.java
index 908ee684..0070948e 100644
--- a/tests/src/com/android/browser/PopularUrlsTest.java
+++ b/tests/src/com/android/browser/PopularUrlsTest.java
@@ -25,7 +25,6 @@ import android.provider.Browser;
 import android.test.ActivityInstrumentationTestCase2;
 import android.text.TextUtils;
 import android.util.Log;
-import android.webkit.ClientCertRequestHandler;
 import android.webkit.DownloadListener;
 import android.webkit.HttpAuthHandler;
 import android.webkit.JsPromptResult;
@@ -230,16 +229,6 @@ public class PopularUrlsTest extends ActivityInstrumentationTestCase2<BrowserAct
             }
 
             /**
-             * Ignores and logs SSL client certificate requests.
-             */
-            @Override
-            public void onReceivedClientCertRequest(WebView view, ClientCertRequestHandler handler,
-                    String host_and_port) {
-                Log.w(TAG, "SSL client certificate request: " + host_and_port);
-                handler.cancel();
-            }
-
-            /**
              * Ignores http auth with dummy username and password
              */
             @Override
diff --git a/tests/src/com/android/browser/TestWebViewClient.java b/tests/src/com/android/browser/TestWebViewClient.java
index 7b774480..c092c96e 100644
--- a/tests/src/com/android/browser/TestWebViewClient.java
+++ b/tests/src/com/android/browser/TestWebViewClient.java
@@ -22,7 +22,6 @@ import android.os.Message;
 import android.view.KeyEvent;
 import android.webkit.WebViewClientClassicExt;
 
-import org.codeaurora.swe.ClientCertRequestHandler;
 import org.codeaurora.swe.HttpAuthHandler;
 import org.codeaurora.swe.SslErrorHandler;
 import org.codeaurora.swe.WebView;
@@ -104,17 +103,6 @@ abstract class TestWebViewClient extends WebViewClientClassicExt {
 
   /** {@inheritDoc} */
   @Override
-  public void onReceivedClientCertRequest(WebView view, ClientCertRequestHandler handler,
-          String host_and_port) {
-    if (mWrappedClient instanceof WebViewClientClassicExt) {
-      ((WebViewClientClassicExt) mWrappedClient).onReceivedClientCertRequest(view, handler, host_and_port);
-    } else {
-      super.onReceivedClientCertRequest(view, handler, host_and_port);
-    }
-  }
-
-  /** {@inheritDoc} */
-  @Override
   public void onReceivedHttpAuthRequest(WebView view,
           HttpAuthHandler handler, String host, String realm) {
       mWrappedClient.onReceivedHttpAuthRequest(view, handler, host, realm);