Merge "DO NOT MERGE Disable webkitsecurity package" into jb-dev
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index d5567c6..0dd3934 100755
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -782,6 +782,17 @@
startWebServer(false);
String baseUrl = mWebServer.getAssetUrl("foo.html");
String historyUrl = "random";
+ mWebServer.resetRequestState();
+ // force the favicon to be loaded first
+ mOnUiThread.loadDataWithBaseURLAndWaitForCompletion(baseUrl,
+ "<html><body></body></html>",
+ "text/html", "UTF-8", historyUrl);
+ new PollingCheck() {
+ @Override
+ protected boolean check() {
+ return mWebServer.getLastRequestUrl().endsWith("favicon.ico");
+ }
+ }.run();
mOnUiThread.loadDataWithBaseURLAndWaitForCompletion(baseUrl,
"<html><body><img src=\"" + imgUrl + "\"/></body></html>",
"text/html", "UTF-8", historyUrl);