commit f8031c7fae43d2cf6a63cd9d7cda94bc2ef3feb0
author Keun-young Park <keunyoung@google.com> Thu May 30 17:19:25 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 30 17:19:25 2013 -0700
tree c32dadd4eeb4f37fe4721c5e8a6b07de0bc4ac5a
parent 5a2831201c82401ba75d85add9b36ff90d5e7f82
parent c79f8df1a1e62633736823cb676bef30531765e0

am c79f8df1: 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

* commit 'c79f8df1a1e62633736823cb676bef30531765e0':
  WebView tests are failing with a timeout failure.Added timeout for the polling check. 	modified:   webkit/src/android/webkit/cts/WebViewClientTest.java

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();