Merge "Hook up WebView.clearSslPreferences() for the Chromium HTTP stack"

core/java/android/webkit/SslCertLookupTable.java

@@ -46,4 +46,8 @@ final class SslCertLookupTable {
     public boolean isAllowed(SslError sslError) {
         return table.getBoolean(sslError.toString());
     }
+
+    public void clear() {
+        table.clear();
+    }
 }

core/java/android/webkit/WebViewCore.java

@@ -1349,8 +1349,14 @@ public final class WebViewCore {
                         }
 
                         case CLEAR_SSL_PREF_TABLE:
-                            Network.getInstance(mContext)
-                                    .clearUserSslPrefTable();
+                            if (JniUtil.useChromiumHttpStack()) {
+                                // FIXME: This will not work for connections currently in use, as
+                                // they cache the certificate responses. See http://b/5324235.
+                                SslCertLookupTable.getInstance().clear();
+                                nativeCloseIdleConnections();
+                            } else {
+                                Network.getInstance(mContext).clearUserSslPrefTable();
+                            }
                             break;
 
                         case TOUCH_UP: