android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java - Issue 1025933002: Convert force video overlay to preference

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1025933002: Convert force video overlay to preference (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review Created 5 years, 9 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/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/MultipleVideosTest.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/ExternalVideoSurfaceContainerTest.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java

index e5c5246adaca5527f9413a55d4ac7eb160c827df..762cd47e08bab5d59aabd62fd0449003423276be 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java

@@ -10,7 +10,6 @@ import android.test.suitebuilder.annotation.SmallTest;

import org.chromium.android_webview.ExternalVideoSurfaceContainer;

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

-import org.chromium.base.CommandLine;

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

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

import org.chromium.content.browser.ContentViewCore;

@@ -106,12 +105,10 @@ public class ExternalVideoSurfaceContainerTest extends AwTestBase {

public void testEnableVideoOverlayForEmbeddedVideo() throws Throwable {

setUpMockExternalVideoSurfaceContainer();

- CommandLine.getInstance().appendSwitch("force-use-overlay-embedded-video");

int onRequestCallCount = mOnRequestExternalVideoSurface.getCallCount();

int onPositionChangedCallCount = mOnExternalVideoSurfacePositionChanged.getCallCount();

- assertTrue(VideoTestUtil.runVideoTest(this, false, WAIT_TIMEOUT_MS));

+ assertTrue(VideoTestUtil.runVideoTest(this, false, true, WAIT_TIMEOUT_MS));

mOnRequestExternalVideoSurface.waitForCallback(onRequestCallCount);

waitForVideoSizeChangeTo(mOnExternalVideoSurfacePositionChanged,

@@ -124,7 +121,7 @@ public class ExternalVideoSurfaceContainerTest extends AwTestBase {

public void testDisableVideoOverlayForEmbeddedVideo() throws Throwable {

setUpMockExternalVideoSurfaceContainer();

- assertTrue(VideoTestUtil.runVideoTest(this, false, WAIT_TIMEOUT_MS));

+ assertTrue(VideoTestUtil.runVideoTest(this, false, false, WAIT_TIMEOUT_MS));

assertEquals(0, mOnRequestExternalVideoSurface.getCallCount());

assertEquals(0, mOnExternalVideoSurfacePositionChanged.getCallCount());