chrome/browser/media/encrypted_media_istypesupported_browsertest.cc - Issue 246033002: Store SupportedCodecs in KeySystemInfo and KeySystems.

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: chrome/browser/media/encrypted_media_istypesupported_browsertest.cc

Issue 246033002: Store SupportedCodecs in KeySystemInfo and KeySystems. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix Android build. 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

« android_webview/renderer/DEPS ('K') | « android_webview/renderer/aw_key_systems.cc ('k') | chrome/browser/media/encrypted_media_message_filter_android.cc » ('j') | chrome/browser/media/encrypted_media_message_filter_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/encrypted_media_istypesupported_browsertest.cc

diff --git a/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc b/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc

index ed0e4daa000ee341649c93e4df2b08d0849e6136..f524260acab2410ddc1e01e1dc5890543fce6bb6 100644

--- a/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc

+++ b/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc

@@ -859,13 +859,13 @@ IN_PROC_BROWSER_TEST_F(EncryptedMediaIsTypeSupportedWidevineTest,

"video/mp4", mixed_codecs(), kWidevineAlpha));

// Valid audio types.

- EXPECT_WVMP4(IsSupportedKeySystemWithMediaMimeType(

+ EXPECT_WVAAC(IsSupportedKeySystemWithMediaMimeType(

ddorwin 2014/04/22 21:24:41 This must not change. It will negatively affect pr

xhwang 2014/04/23 17:29:14 Done.

"audio/mp4", no_codecs(), kWidevineAlpha));

EXPECT_WVAAC(IsSupportedKeySystemWithMediaMimeType(

"audio/mp4", aac_codec(), kWidevineAlpha));

// Valid audio types - parent key system.

- EXPECT_WVMP4(IsSupportedKeySystemWithMediaMimeType(

+ EXPECT_WVAAC(IsSupportedKeySystemWithMediaMimeType(

ddorwin 2014/04/22 21:24:41 ditto

xhwang 2014/04/23 17:29:14 Done.

"audio/mp4", no_codecs(), kWidevine));

EXPECT_WVAAC(IsSupportedKeySystemWithMediaMimeType(

"audio/mp4", aac_codec(), kWidevine));