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

webkit/renderer/media/crypto/key_systems_unittest.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 <string>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "webkit/renderer/media/crypto/key_systems.h"
@@ skipping 522 matching lines @@
   // Non-MP4 codec.
   EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
       "audio/mp4", vorbis_codec(), kExternalClearKey));
 }
 
 //
 // Widevine
 //
 
 TEST_F(KeySystemsTest, Widevine_Basic) {
-#if defined(WIDEVINE_CDM_AVAILABLE) && \
-    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));
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
   const char* const kWidevineUmaName = "Widevine";
 #else
   const char* const kWidevineUmaName = "Unknown";
 #endif
   EXPECT_STREQ(
       kWidevineUmaName,
@@ skipping 10 matching lines @@
 #else
   EXPECT_TRUE(GetPepperType(kWidevineAlpha).empty());
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 }
 
 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)));
-#else
   EXPECT_WV(IsSupportedKeySystem(WebString::fromUTF8(kWidevineParent)));
-#endif
   EXPECT_WV(IsSupportedKeySystemWithMediaMimeType(
       "video/webm", no_codecs(), kWidevineParent));
 
   // The parent is not supported for most things.
   EXPECT_STREQ("Unknown",
                KeySystemNameForUMA(std::string(kWidevineParent)).c_str());
   EXPECT_STREQ("Unknown",
       KeySystemNameForUMA(WebString::fromUTF8(kWidevineParent)).c_str());
   EXPECT_FALSE(CanUseAesDecryptor(kWidevineParent));
 #if defined(ENABLE_PEPPER_CDMS)
@@ skipping 180 matching lines @@
 }
 
 TEST_F(KeySystemsTest, GetUUID_Unrecognized) {
   EXPECT_TRUE(GetUUID(kWidevine).empty());
   EXPECT_TRUE(GetUUID(kClearKey).empty());
   EXPECT_TRUE(GetUUID("").empty());
 }
 #endif  // defined(OS_ANDROID)
 
 }  // namespace webkit_media