third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-utils.js - Issue 2169713002: EME: Fix nits for encrypted media layout tests

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: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-utils.js

Issue 2169713002: EME: Fix nits for encrypted media layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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 | « third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-setmediakeys-again-after-resetting-src.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-utils.js

diff --git a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-utils.js b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-utils.js

index d270037922c1296df69ede2cb60bdf88c7b5a0fa..0a2b4d65b3a47cf3ccb5eddc4bbf74fabd61e3c4 100644

--- a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-utils.js

+++ b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-utils.js

@@ -91,7 +91,7 @@ function getSimpleConfigurationForInitDataType(initDataType)

// both audio and video capabilities for the specified file..

function getConfigurationForFile(mediaFile)

{

- if (mediaFile.toLowerCase().endsWith('webm')) {

+ if (mediaFile.toLowerCase().endsWith('.webm')) {

return [ {

initDataTypes: [ 'webm' ],

audioCapabilities: [ { contentType: 'audio/webm; codecs="opus"' } ],

@@ -294,7 +294,7 @@ function extractSingleKeyIdFromMessage(message)

// Create a MediaKeys object for Clear Key with 1 session. KeyId and key

// required for the video are already known and provided. Returns a promise

// that resolves to the MediaKeys object created.

-function createMediaKeys(keyId, key)

+function createClearKeyMediaKeysAndInitializeWithOneKey(keyId, key)

{

var mediaKeys;

var mediaKeySession;