Upstream version 9.38.198.0

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

diff --git a/src/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java b/src/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
index e0a1ead..25b1b03 100644 (file)
--- a/src/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
+++ b/src/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
@@ -9,7 +9,6 @@ import android.view.View;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.test.util.VideoTestWebServer;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.TouchCommon;
@@ -42,31 +41,28 @@ public class AwContentsClientGetVideoLoadingProgressViewTest extends AwTestBase
     }
 
     private void waitForViewAttached() throws InterruptedException, TimeoutException {
-        mViewAttachedCallbackHelper.waitForCallback(0, 1, 20, TimeUnit.SECONDS);
+        mViewAttachedCallbackHelper.waitForCallback(0, 1, WAIT_TIMEOUT_MS,
+                TimeUnit.MILLISECONDS);
     }
 
 
-    /**
-     * @Feature({"AndroidWebView"})
-     * @SmallTest
-     *
-     * http://crbug.com/238735
-     */
-    @DisabledTest
+    @Feature({"AndroidWebView"})
+    @SmallTest
     public void testGetVideoLoadingProgressView() throws Throwable {
         TestAwContentsClient contentsClient =
                 new FullScreenVideoTestAwContentsClient(getActivity()) {
-            @Override
-            protected View getVideoLoadingProgressView() {
-                View view = new View(getInstrumentation().getTargetContext());
-                view.addOnAttachStateChangeListener(
-                        AwContentsClientGetVideoLoadingProgressViewTest.this);
-                return view;
-            }
-        };
+                    @Override
+                    protected View getVideoLoadingProgressView() {
+                        View view = new View(getInstrumentation().getTargetContext());
+                        view.addOnAttachStateChangeListener(
+                                AwContentsClientGetVideoLoadingProgressViewTest.this);
+                        return view;
+                    }
+                };
         final AwTestContainerView testContainerView =
                 createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
+        awContents.getSettings().setFullscreenSupported(true);
         enableJavaScriptOnUiThread(awContents);
         VideoTestWebServer webServer = new VideoTestWebServer(
                 getInstrumentation().getTargetContext());