Revert "Stabilise WebViewTest.testSetDownloadListener"
This reverts commit 323db78c2b70c2e61da0ebf43bfc33ae4b46f88c.
Stabilise WebViewTest.testSetDownloadListener
Work around a bug in Blink/chromium compositor by posting the navigation
to the download URL in a setTimeout.
The issue is not reproducible in chromium trunk and added a fix that would
have made the test pass in kkmr2 already.
BUG: 13693414
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index 6ca37cd..f9d067b 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -1917,13 +1917,9 @@
// the WebView will load the new URL.
mOnUiThread.setDownloadListener(listener);
mOnUiThread.getSettings().setJavaScriptEnabled(true);
-
- // See b/13675265 for discussion on why the setTimeout is necessary.
- // Works around a Blink bug.
mOnUiThread.loadDataAndWaitForCompletion(
- "<html><body onload=\"setTimeout(" +
- "function() { window.location = \'" + url + "\'; }, 100);\">" +
- "</body></html>", "text/html", null);
+ "<html><body onload=\"window.location = \'" + url + "\'\"></body></html>",
+ "text/html", null);
// Wait for layout to complete before setting focus.
getInstrumentation().waitForIdleSync();
