android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java - Issue 250483002: [Android WebView] Add tests to check whether the hole punching works.

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java

Issue 250483002: [Android WebView] Add tests to check whether the hole punching works. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java

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 16ab9d93c547d14889912e0c6ed7c50e1c7184c3..e21e2e844d1bcc95e2e2c31c8d9ee6b6c1ce9330 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

@@ -24,7 +24,6 @@ import org.chromium.android_webview.AwSettings.LayoutAlgorithm;

import org.chromium.android_webview.InterceptedRequestData;

import org.chromium.android_webview.test.util.CommonResources;

import org.chromium.android_webview.test.util.ImagePageGenerator;

-import org.chromium.android_webview.test.util.JavascriptEventObserver;

import org.chromium.android_webview.test.util.VideoTestWebServer;

import org.chromium.base.test.util.DisabledTest;

import org.chromium.base.test.util.Feature;

@@ -2537,51 +2536,6 @@ public class AwSettingsTest extends AwTestBase {

assertEquals(defaultScale, getPixelScaleOnUiThread(awContents), .01f);

}

- /**

- * Run video test.

- * @param requiredUserGesture the settings of MediaPlaybackRequiresUserGesture.

- * @param waitTime time for waiting event happen, -1 means forever.

- * @return true if the event happened,

- * @throws Throwable throw exception if timeout.

- */

- private boolean runVideoTest(final boolean requiredUserGesture, long waitTime)

- throws Throwable {

- final JavascriptEventObserver observer = new JavascriptEventObserver();

- TestAwContentsClient client = new TestAwContentsClient();

- final AwContents awContents = createAwTestContainerViewOnMainSync(client).getAwContents();

- getInstrumentation().runOnMainSync(new Runnable() {

- @Override

- public void run() {

- AwSettings awSettings = awContents.getSettings();

- awSettings.setJavaScriptEnabled(true);

- awSettings.setMediaPlaybackRequiresUserGesture(requiredUserGesture);

- observer.register(awContents.getContentViewCore(), "javaObserver");

- }

- });

- VideoTestWebServer webServer = new VideoTestWebServer(getActivity());

- try {

- String data = "<html><head><script>" +

- "addEventListener('DOMContentLoaded', function() { " +

- " document.getElementById('video').addEventListener('play', function() { " +

- " javaObserver.notifyJava(); " +

- " }, false); " +

- "}, false); " +

- "</script></head><body>" +

- "<video id='video' autoplay control src='" +

- webServer.getOnePixelOneFrameWebmURL() + "' /> </body></html>";

- loadDataAsync(awContents, data, "text/html", false);

- if (waitTime == -1) {

- observer.waitForEvent();

- return true;

- } else {

- return observer.waitForEvent(waitTime);

- }

- } finally {

- if (webServer != null && webServer.getTestWebServer() != null)

- webServer.getTestWebServer().shutdown();

- }

@LargeTest

@Feature({"AndroidWebView", "Preferences"})