Partial revert of "Add function to support clearing SSL/certificate store."

https://codereview.chromium.org/161653002/ added the relevant hook but
exposed it in the Java layer without enforcing the call is made on the
right thread. Remove the Java hook and use the one from
https://codereview.chromium.org/168313002/ instead which is at the
chrome layer and can enforce correct threading.

NOTRY=true

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253192 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 0 insertions, 14 deletions

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java b/chrome/android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java
index a8c3bf3..98988b3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java
@@ -297,8 +297,6 @@ public class SSLClientCertificateRequest {
         return true;
     }
 
-    // TODO(yfriedman): Java code doesn't have a global for the IO thread so it's exposed here.
-    // X509Util helper function could probably move here (as it's still in net/)
     public static void notifyClientCertificatesChangedOnIOThread() {
         Log.d(TAG, "ClientCertificatesChanged!");
         nativeNotifyClientCertificatesChangedOnIOThread();
diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java
index cd8a29a..90012a4 100644
--- a/net/android/java/src/org/chromium/net/X509Util.java
+++ b/net/android/java/src/org/chromium/net/X509Util.java
@@ -291,11 +291,6 @@ public class X509Util {
         ensureInitialized();
     }
 
-    public static void notifyClientCertificatesChanged() {
-        Log.d(TAG, "ClientCertificatesChanged!");
-        nativeNotifyClientCertificatesChanged();
-    }
-
     /**
      * Convert a DER encoded certificate to an X509Certificate.
      */
@@ -443,9 +438,6 @@ public class X509Util {
     public static void setDisableNativeCodeForTest(boolean disabled) {
         sDisableNativeCodeForTest = disabled;
     }
-
-    private static native void nativeNotifyClientCertificatesChanged();
-
     /**
      * Notify the native net::CertDatabase instance that the system database has been updated.
      */
diff --git a/net/cert/x509_util_android.cc b/net/cert/x509_util_android.cc
index e63e104..128ea85 100644
--- a/net/cert/x509_util_android.cc
+++ b/net/cert/x509_util_android.cc
@@ -16,10 +16,6 @@ void NotifyKeyChainChanged(JNIEnv* env, jclass clazz) {
   CertDatabase::GetInstance()->OnAndroidKeyChainChanged();
 }
 
-void NotifyClientCertificatesChanged(JNIEnv* env, jclass clazz) {
-  CertDatabase::GetInstance()->OnAndroidKeyStoreChanged();
-}
-
 void RecordCertVerifyCapabilitiesHistogram(JNIEnv* env,
                                            jclass clazz,
                                            jboolean found_system_trust_roots) {