Initial implementation of Encrypted Media Extensions in Chrome.

webkit/tools/test_shell/test_shell_webmimeregistry_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_
 #define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 11 matching lines @@
   // by all variations of Chromium.
   //
   // Media layout tests use canPlayType() to determine the test input files.
   // Different flavours of Chromium support different codecs, which has an
   // impact on how canPlayType() behaves.  Since Chromium's baselines and
   // expectations are generated against the common set of types, we need to
   // prevent canPlayType() from indicating it supports other types when running
   // layout tests.
   virtual WebKit::WebMimeRegistry::SupportsType supportsMediaMIMEType(
       const WebKit::WebString&,
-      const WebKit::WebString&) OVERRIDE;
+      const WebKit::WebString&,
+      const WebKit::WebString& keySystem) OVERRIDE;

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

nit: remove arg name

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

Done.

 
  private:
   bool IsBlacklistedMediaMimeType(const std::string& mime_type);
   bool HasBlacklistedMediaCodecs(const std::vector<std::string>& codecs);
 
   std::vector<std::string> blacklisted_media_types_;
   std::vector<std::string> blacklisted_media_codecs_;
 
   DISALLOW_COPY_AND_ASSIGN(TestShellWebMimeRegistryImpl);
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_