Initial implementation of Encrypted Media Extensions in Chrome.

webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc

 // 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.
 
 #include "webkit/tools/test_shell/test_shell_webmimeregistry_impl.h"
 
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
@@ skipping 17 matching lines @@
   net::GetProprietaryMediaCodecs(&blacklisted_media_codecs_);
 }
 
 TestShellWebMimeRegistryImpl::~TestShellWebMimeRegistryImpl() {}
 
 // Returns IsNotSupported if mime_type or any of the codecs are not supported.
 // Otherwse, defers to the real registry.
 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;
 
   std::vector<std::string> parsed_codecs;
   net::ParseCodecString(ToASCIIOrEmpty(codecs), &parsed_codecs, true);
   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(
     const std::string& mime_type) {
   for (size_t i = 0; i < blacklisted_media_types_.size(); ++i) {
     if (blacklisted_media_types_[i] == mime_type)
       return true;
   }
   return false;
 }
 
 bool TestShellWebMimeRegistryImpl::HasBlacklistedMediaCodecs(
     const std::vector<std::string>& codecs) {
   for (size_t i = 0; i < codecs.size(); ++i) {
     for (size_t j = 0; j < blacklisted_media_codecs_.size(); ++j) {
       if (blacklisted_media_codecs_[j] == codecs[i])
         return true;
     }
   }
   return false;
 }