summaryrefslogtreecommitdiffstats
path: root/android_webview/javatests
diff options
context:
space:
mode:
Diffstat (limited to 'android_webview/javatests')
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java9
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java10
2 files changed, 5 insertions, 14 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
index bc3c16f..51e30eb 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
@@ -9,7 +9,6 @@ import android.test.TouchUtils;
import android.view.KeyEvent;
import org.chromium.android_webview.test.util.VideoTestWebServer;
-import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature;
/**
@@ -17,12 +16,8 @@ import org.chromium.base.test.util.Feature;
*/
public class AwContentsClientFullScreenVideoTest extends AwTestBase {
- /*
- * @Feature({"AndroidWebView"})
- * @SmallTest
- * http://crbug.com/180575
- */
- @DisabledTest
+ @Feature({"AndroidWebView"})
+ @SmallTest
public void testOnShowAndHideCustomView() throws Throwable {
FullScreenVideoTestAwContentsClient contentsClient =
new FullScreenVideoTestAwContentsClient(getActivity());
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
index 5ea92d2..312ecb5 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
@@ -10,7 +10,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;
@@ -45,12 +44,9 @@ public class AwContentsClientGetVideoLoadingProgressViewTest extends AwTestBase
mViewAttachedCallbackHelper.waitForCallback(0, 1, 20, TimeUnit.SECONDS);
}
- /*
- * @Feature({"AndroidWebView"})
- * @SmallTest
- * http://crbug.com/180575
- */
- @DisabledTest
+
+ @Feature({"AndroidWebView"})
+ @SmallTest
public void testGetVideoLoadingProgressView() throws Throwable {
TestAwContentsClient contentsClient =
new FullScreenVideoTestAwContentsClient(getActivity()) {