android_webview/javatests/src/org/chromium/android_webview/test/KeySystemTest.java - Issue 2678433003: media: Require SecureContext for EME APIs

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

Issue 2678433003: media: Require SecureContext for EME APIs (Closed)

Patch Set: rebase & fix upload error Created 3 years, 10 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/AwTestBase.java ('k') | android_webview/test/BUILD.gn » ('j') | third_party/WebKit/LayoutTests/http/tests/security/powerfulFeatureRestrictions/old-powerful-features-on-insecure-origin.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3bda0041ee011f3b717ff0e58a2eaf7e75a38722..f93933dd11b5f5711fd47a28c94a6875c976737a 100644

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

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

@@ -50,36 +50,11 @@ public class KeySystemTest extends AwTestBase {

mAwContents = testContainerView.getAwContents();

enableJavaScriptOnUiThread(mAwContents);

- loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),

- getKeySystemTestPage(), "text/html", false);

- }

+ // Treat file:/// as secure context, which is required by EME APIs.

+ allowFileAccessFromFileURLs(mAwContents);

- private String getKeySystemTestPage() {

- // requestMediaKeySystemAccess() provides 2 different configurations

- // as encrypted webm is only supported on Lollipop+. mp4 is proprietary,

- // and may not be supported on all Android devices.

- return "<html> <script>"

- + "var result;"

- + "function success(keySystemAccess) {"

- + " result = 'supported';"

- + "}"

- + "function failure(error){"

- + " result = error.name;"

- + "}"

- + "function isKeySystemSupported(keySystem) {"

- + " navigator.requestMediaKeySystemAccess("

- + " keySystem, "

- + " [{audioCapabilities:"

- + " [{contentType: 'audio/webm; codec=\"vorbis\"'}]}, "

- + " {videoCapabilities:"

- + " [{contentType: 'video/mp4; codecs=\"avc1.4D000C\"'}]}])"

- + " .then(success, failure);"

- + "}"

- + "function areProprietaryCodecsSupported() {"

- + " var video = document.createElement('video');"

- + " return video.canPlayType('video/mp4; codecs=\"avc1\"');"

- + "}"

- + "</script> </html>";

+ loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),

+ "file:///android_asset/key-system-test.html");

}

private String isKeySystemSupported(String keySystem) throws Exception {