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

webkit/renderer/media/crypto/key_systems_unittest.cc

Index: webkit/renderer/media/crypto/key_systems_unittest.cc
diff --git a/webkit/renderer/media/crypto/key_systems_unittest.cc b/webkit/renderer/media/crypto/key_systems_unittest.cc
index b8cb1d72d44495636be4e8491d79dff5a6208a6c..98cc9502238bc445fcc93c0564397140f102140b 100644
--- a/webkit/renderer/media/crypto/key_systems_unittest.cc
+++ b/webkit/renderer/media/crypto/key_systems_unittest.cc
@@ -540,7 +540,13 @@ TEST_F(KeySystemsTest,
 //
 
 TEST_F(KeySystemsTest, Widevine_Basic) {
+#if defined(WIDEVINE_CDM_AVAILABLE) && \

[ddorwin, 2013/06/22 04:44:35]

This test was actually failing because it expected FALSE!

+    defined(DISABLE_WIDEVINE_CDM_CANPLAYTYPE)
+  EXPECT_TRUE(IsSupportedKeySystem(WebString::fromUTF8(kWidevineAlpha)));
+#else
   EXPECT_WV(IsSupportedKeySystem(WebString::fromUTF8(kWidevineAlpha)));
+#endif
+
   EXPECT_WV(IsSupportedKeySystemWithMediaMimeType(
       "video/webm", no_codecs(), kWidevineAlpha));
 
@@ -571,7 +577,12 @@ TEST_F(KeySystemsTest, Widevine_Basic) {
 TEST_F(KeySystemsTest, Widevine_Parent) {
   const char* const kWidevineParent = kWidevine;
 
+#if defined(WIDEVINE_CDM_AVAILABLE) && \
+    defined(DISABLE_WIDEVINE_CDM_CANPLAYTYPE)
+  EXPECT_TRUE(IsSupportedKeySystem(WebString::fromUTF8(kWidevineParent)));

[ddorwin, 2013/06/22 04:44:35]

This one was false before because there was not a dummy entry for it in
kSupportedFormatKeySystemCombinations.
Ideally, the path (EME APIs) that uses this would fail. That's a separate issue,
and this just keeps the behavior consistent regardless of
DISABLE_WIDEVINE_CDM_CANPLAYTYPE.

+#else
   EXPECT_WV(IsSupportedKeySystem(WebString::fromUTF8(kWidevineParent)));
+#endif
   EXPECT_WV(IsSupportedKeySystemWithMediaMimeType(
       "video/webm", no_codecs(), kWidevineParent));