Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / android_webview / javatests / src / org / chromium / android_webview / test / FullScreenVideoTestAwContentsClient.java

diff --git a/src/android_webview/javatests/src/org/chromium/android_webview/test/FullScreenVideoTestAwContentsClient.java b/src/android_webview/javatests/src/org/chromium/android_webview/test/FullScreenVideoTestAwContentsClient.java
index e00b5ff..7973a8d 100644 (file)
--- a/src/android_webview/javatests/src/org/chromium/android_webview/test/FullScreenVideoTestAwContentsClient.java
+++ b/src/android_webview/javatests/src/org/chromium/android_webview/test/FullScreenVideoTestAwContentsClient.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -12,6 +12,8 @@ import android.view.WindowManager;
 import android.webkit.WebChromeClient;
 import android.widget.FrameLayout;
 
+import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
+
 import org.chromium.content.browser.test.util.CallbackHelper;
 
 import java.util.concurrent.TimeUnit;
@@ -21,7 +23,7 @@ import java.util.concurrent.TimeoutException;
  * This class is a AwContentsClient for full screen video test.
  */
 public class FullScreenVideoTestAwContentsClient extends TestAwContentsClient {
-    public final static int WAITING_SECONDS = 20;
+    public static final long WAITING_SECONDS = scaleTimeout(20);
     private CallbackHelper mOnShowCustomViewCallbackHelper = new CallbackHelper();
     private CallbackHelper mOnHideCustomViewCallbackHelper = new CallbackHelper();
 
@@ -58,4 +60,4 @@ public class FullScreenVideoTestAwContentsClient extends TestAwContentsClient {
     public void waitForCustomViewHidden() throws InterruptedException, TimeoutException {
         mOnHideCustomViewCallbackHelper.waitForCallback(0, 1, WAITING_SECONDS, TimeUnit.SECONDS);
     }
-}
\ No newline at end of file
+}