Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(827)

Unified Diff: webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc

Issue 10020053: Initial implementation of Encrypted Media Extensions in Chrome. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: removed key_systems namespace Created 8 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
« no previous file with comments | « webkit/tools/test_shell/test_shell_webmimeregistry_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc
diff --git a/webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc b/webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc
index ebc19e25184ff76fb39c4158d94e8536eb6c76cb..e08842bb3fb3b9d48ac70378f492b3c1e7d4896b 100644
--- a/webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc
+++ b/webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc
@@ -35,7 +35,8 @@ TestShellWebMimeRegistryImpl::~TestShellWebMimeRegistryImpl() {}
WebMimeRegistry::SupportsType
TestShellWebMimeRegistryImpl::supportsMediaMIMEType(
const WebString& mime_type,
- const WebString& codecs) {
+ const WebString& codecs,
+ const WebKit::WebString& key_system) {
if (IsBlacklistedMediaMimeType(ToASCIIOrEmpty(mime_type)))
return IsNotSupported;
@@ -44,7 +45,8 @@ TestShellWebMimeRegistryImpl::supportsMediaMIMEType(
if (HasBlacklistedMediaCodecs(parsed_codecs))
return IsNotSupported;
- return SimpleWebMimeRegistryImpl::supportsMediaMIMEType(mime_type, codecs);
+ return SimpleWebMimeRegistryImpl::supportsMediaMIMEType(
+ mime_type, codecs, key_system);
}
bool TestShellWebMimeRegistryImpl::IsBlacklistedMediaMimeType(
« no previous file with comments | « webkit/tools/test_shell/test_shell_webmimeregistry_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698