Initial implementation of Encrypted Media Extensions in Chrome.

webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc

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 c997bd7d3b921f9ac0576c6941b49376b519c67f..14d96ab2f9bade814ca622baaf80444448a32909 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& keySystem) {

[scherkus (not reviewing), 2012/04/12 20:18:41]

key_system

[ddorwin, 2012/04/12 23:41:23]

Done.

   if (IsBlacklistedMediaMimeType(ToASCIIOrEmpty(mime_type)))
     return IsNotSupported;
 
@@ -44,7 +45,9 @@ TestShellWebMimeRegistryImpl::supportsMediaMIMEType(
   if (HasBlacklistedMediaCodecs(parsed_codecs))
     return IsNotSupported;
 
-  return SimpleWebMimeRegistryImpl::supportsMediaMIMEType(mime_type, codecs);
+  return SimpleWebMimeRegistryImpl::supportsMediaMIMEType(mime_type,

[scherkus (not reviewing), 2012/04/12 20:18:41]

nit: I'd just drop all args to next line + indent by 4

[ddorwin, 2012/04/12 23:41:23]

Done.

+                                                          codecs,
+                                                          keySystem);
 }
 
 bool TestShellWebMimeRegistryImpl::IsBlacklistedMediaMimeType(