3 files changed, 6 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 9d262f1..0ed3dbcf 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -54,3 +54,4 @@ BUGCR123680 : fast/repaint/shadow-multiple-vertical.html = IMAGE
 BUGCR123680 : svg/W3C-SVG-1.1/masking-intro-01-f.svg = IMAGE
 BUGCR123809 : fast/borders/border-radius-groove-02.html = IMAGE
 
+BUGWK82983 : media/encrypted-media/ = PASS
diff --git a/webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc b/webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc
index ebc19e2..e08842b 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(
diff --git a/webkit/tools/test_shell/test_shell_webmimeregistry_impl.h b/webkit/tools/test_shell/test_shell_webmimeregistry_impl.h
index 40ac863..6fcff259 100644
--- a/webkit/tools/test_shell/test_shell_webmimeregistry_impl.h
+++ b/webkit/tools/test_shell/test_shell_webmimeregistry_impl.h
@@ -29,6 +29,7 @@ class TestShellWebMimeRegistryImpl
   // layout tests.
   virtual WebKit::WebMimeRegistry::SupportsType supportsMediaMIMEType(
       const WebKit::WebString&,
+      const WebKit::WebString&,
       const WebKit::WebString&) OVERRIDE;
 
  private: