diff options
author | boliu <boliu@chromium.org> | 2015-11-24 15:41:13 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-24 23:42:50 +0000 |
commit | 32305380195864dce4ac3ad965302a338e4c92d0 (patch) | |
tree | 9b78e692d321662e46cbfefeb2357d788e2c812f /android_webview | |
parent | 4f7d4339b767ebf5c01d526758b3e32af5790372 (diff) | |
download | chromium_src-32305380195864dce4ac3ad965302a338e4c92d0.zip chromium_src-32305380195864dce4ac3ad965302a338e4c92d0.tar.gz chromium_src-32305380195864dce4ac3ad965302a338e4c92d0.tar.bz2 |
Enable testMediaPlaybackWithoutUserGesture
Test is passing.
BUG=304549
Review URL: https://codereview.chromium.org/1476623002
Cr-Commit-Position: refs/heads/master@{#361490}
Diffstat (limited to 'android_webview')
-rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java index 431c2a2..a9643c8 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java @@ -9,6 +9,7 @@ import android.graphics.Point; import android.net.http.SslError; import android.os.Build; import android.os.SystemClock; +import android.test.suitebuilder.annotation.LargeTest; import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.SmallTest; import android.view.WindowManager; @@ -28,7 +29,6 @@ import org.chromium.android_webview.test.util.CommonResources; import org.chromium.android_webview.test.util.ImagePageGenerator; import org.chromium.android_webview.test.util.VideoTestUtil; 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.base.test.util.TestFileUtil; import org.chromium.base.test.util.UrlUtils; @@ -2716,13 +2716,9 @@ public class AwSettingsTest extends AwTestBase { assertEquals(defaultScale, getPixelScaleOnUiThread(awContents), .01f); } - /* @DisableHardwareAccelerationForTest @LargeTest @Feature({"AndroidWebView", "Preferences"}) - http://crbug.com/304549 - */ - @DisabledTest public void testMediaPlaybackWithoutUserGesture() throws Throwable { assertTrue(VideoTestUtil.runVideoTest(this, false, false, WAIT_TIMEOUT_MS)); } |