From f09aafa27503becdcbe2244356c2c7505dff8fe4 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Mon, 20 Sep 2010 14:02:28 +0100
Subject: Fix DumpRenderTree2 to handle SSL errors

This fixes http/tests/appcache/different-https-origin-resource-main.html

Change-Id: I90e151c027b2d8c55ea82104c02e4a641b933024
---
 .../com/android/dumprendertree2/LayoutTestsExecutor.java  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'tests/DumpRenderTree2/src')

diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java
index 20687e5..c0ba9e5 100644
--- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java
+++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java
@@ -22,6 +22,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.net.Uri;
+import android.net.http.SslError;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
@@ -30,19 +31,20 @@ import android.os.Message;
 import android.os.Messenger;
 import android.os.PowerManager;
 import android.os.Process;
-import android.os.RemoteException;
 import android.os.PowerManager.WakeLock;
+import android.os.RemoteException;
 import android.util.Log;
 import android.view.Window;
 import android.webkit.ConsoleMessage;
+import android.webkit.GeolocationPermissions;
 import android.webkit.HttpAuthHandler;
 import android.webkit.JsPromptResult;
 import android.webkit.JsResult;
+import android.webkit.SslErrorHandler;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.webkit.GeolocationPermissions;
 import android.webkit.WebStorage.QuotaUpdater;
 
 import java.io.File;
@@ -74,7 +76,7 @@ public class LayoutTestsExecutor extends Activity {
         }
     }
 
-    private static final String LOG_TAG = "LayoutTestExecutor";
+    private static final String LOG_TAG = "LayoutTestsExecutor";
 
     public static final String EXTRA_TESTS_LIST = "TestsList";
     public static final String EXTRA_TEST_INDEX = "TestIndex";
@@ -180,6 +182,13 @@ public class LayoutTestsExecutor extends Activity {
              }
              handler.cancel();
          }
+
+         @Override
+         public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+             // We ignore SSL errors. In particular, the certificate used by the LayoutTests server
+             // produces an error as it lacks a CN field.
+             handler.proceed();
+         }
     };
 
     private WebChromeClient mWebChromeClient = new WebChromeClient() {
-- 
cgit v1.1