Merge changes I447cd196,I0c6cdae4

* changes:
  SSL-related cleanup in BrowserFrame and SslCertLookupTable
  Clean up SslErrorHandlerImpl

1 files changed, 4 insertions, 3 deletions

diff --git a/core/java/android/webkit/SslCertLookupTable.java b/core/java/android/webkit/SslCertLookupTable.java
index 06d54be..a06836c 100644
--- a/core/java/android/webkit/SslCertLookupTable.java
+++ b/core/java/android/webkit/SslCertLookupTable.java
@@ -25,7 +25,8 @@ import java.net.URL;
 /**
  * Stores the user's decision of whether to allow or deny an invalid certificate.
  *
- * This class is not threadsafe. It is used only on the WebCore thread.
+ * This class is not threadsafe. It is used only on the WebCore thread. Also, it
+ * is used only by the Chromium HTTP stack.
  */
 final class SslCertLookupTable {
     private static SslCertLookupTable sTable;
@@ -42,11 +43,11 @@ final class SslCertLookupTable {
         table = new Bundle();
     }
 
-    public void setIsAllowed(SslError sslError, boolean allow) {
+    public void setIsAllowed(SslError sslError) {
         // TODO: We should key on just the host. See http://b/5409251.
         String errorString = sslErrorToString(sslError);
         if (errorString != null) {
-            table.putBoolean(errorString, allow);
+            table.putBoolean(errorString, true);
         }
     }