diff options
| author | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-27 19:16:19 +0000 |
|---|---|---|
| committer | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-27 19:16:19 +0000 |
| commit | 244bacf6aa24e1a89a2fa17e170043be0f1c44eb (patch) | |
| tree | 232a69697789870e8cbe7add213cb33fd6187f36 /android_webview | |
| parent | 6963ed20808c69565befb084dc1641a2b6b69f0d (diff) | |
| download | chromium_src-244bacf6aa24e1a89a2fa17e170043be0f1c44eb.zip chromium_src-244bacf6aa24e1a89a2fa17e170043be0f1c44eb.tar.gz chromium_src-244bacf6aa24e1a89a2fa17e170043be0f1c44eb.tar.bz2 | |
Enable FullScreenVideo tests
BUG=180575
Review URL: https://chromiumcodereview.appspot.com/12928005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190996 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
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()) { |