commit c79f8df1a1e62633736823cb676bef30531765e0
author Keun-young Park <keunyoung@google.com> Fri May 31 00:17:25 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 31 00:17:25 2013 +0000
tree 335eec01721b09f98e432e2a2d1452825b5264c6
parent f5cf633794eeb16507c40e2a4a03ade4a105eb65
parent 24ee917f692d72068a61fc2b6c2e135394223a61

Merge "WebView tests are failing with a timeout failure.Added timeout for the polling check. 	modified:   webkit/src/android/webkit/cts/WebViewClientTest.java" into jb-mr2-dev

tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java

diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
index ccc6444..3353d50 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
@@ -42,7 +42,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         final WebViewStubActivity activity = getActivity();
-        new PollingCheck() {
+        new PollingCheck(TEST_TIMEOUT) {
             @Override
                 protected boolean check() {
                 return activity.hasWindowFocus();