Allow suppressed EME canPlayType() responses to be overridden with a flag.

webkit/renderer/media/crypto/key_systems.cc

 // Copyright 2013 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 <map>
 
 #include "webkit/renderer/media/crypto/key_systems.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 94 matching lines @@
     return false;
 
   const CodecMappings& codecs = mime_iter->second;
   return (codecs.find(codec) != codecs.end()) && IsSystemCompatible(key_system);
 }
 
 bool KeySystems::IsSupportedKeySystemWithMediaMimeType(
     const std::string& mime_type,
     const std::vector<std::string>& codecs,
     const std::string& key_system) {
+  // This method is only used by the canPlaytType() path (not the EME methods),
+  // so we check for suppressed key_systems here.
+  if(IsCanPlayTypeSuppressed(key_system))
+    return false;
+
   if (codecs.empty())
     return IsSupportedKeySystemWithContainerAndCodec(
         mime_type, std::string(), key_system);
 
   for (size_t i = 0; i < codecs.size(); ++i) {
     if (!IsSupportedKeySystemWithContainerAndCodec(
             mime_type, codecs[i], key_system))
       return false;
   }
 
@@ skipping 40 matching lines @@
   for (int i = 0; i < kNumKeySystemToUUIDMapping; ++i) {
     if (kKeySystemToUUIDMapping[i].key_system == key_system)
       return std::vector<uint8>(kKeySystemToUUIDMapping[i].uuid,
                                 kKeySystemToUUIDMapping[i].uuid + 16);
   }
   return std::vector<uint8>();
 }
 #endif  // defined(OS_ANDROID)
 
 }  // namespace webkit_media