android_webview/javatests/src/org/chromium/android_webview/test/MultipleVideosTest.java - Issue 1110833004: Move audio focus control from media/ to content/ and make it per WebContents.

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/MultipleVideosTest.java

Issue 1110833004: Move audio focus control from media/ to content/ and make it per WebContents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 7 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/AwContentsClientFullScreenTest.java ('k') | content/browser/android/browser_jni_registrar.cc » ('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/MultipleVideosTest.java

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

index 8e55cd2630683b88371957d1eb642fc50ff55dfd..490686cd4eea66e7cc6078436cf180998928937e 100644

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

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

@@ -57,7 +57,7 @@ public class MultipleVideosTest extends AwTestBase {

// Play the first video.

tapFirstPlayButton();

- assertTrue(DOMUtils.waitForVideoPlay(getWebContentsOnUiThread(), FIRST_VIDEO_ID));

+ assertTrue(DOMUtils.waitForMediaPlay(getWebContentsOnUiThread(), FIRST_VIDEO_ID));

// Verify that there is one video hole surface.

VideoSurfaceViewUtils.pollAndAssertContainsOneVideoHoleSurfaceView(this,

@@ -65,11 +65,11 @@ public class MultipleVideosTest extends AwTestBase {

// Start the second video.

tapSecondPlayButton();

- assertTrue(DOMUtils.waitForVideoPlay(getWebContentsOnUiThread(), SECOND_VIDEO_ID));

+ assertTrue(DOMUtils.waitForMediaPlay(getWebContentsOnUiThread(), SECOND_VIDEO_ID));

// Verify that the first video pauses once the second video starts.

- assertFalse(DOMUtils.isVideoPaused(getWebContentsOnUiThread(), SECOND_VIDEO_ID));

- assertTrue(DOMUtils.isVideoPaused(getWebContentsOnUiThread(), FIRST_VIDEO_ID));

+ assertFalse(DOMUtils.isMediaPaused(getWebContentsOnUiThread(), SECOND_VIDEO_ID));

+ assertTrue(DOMUtils.isMediaPaused(getWebContentsOnUiThread(), FIRST_VIDEO_ID));

// Verify that there is still only one video hole surface.

VideoSurfaceViewUtils.pollAndAssertContainsOneVideoHoleSurfaceView(this,