Index: media/base/key_systems_unittest.cc |
diff --git a/media/base/key_systems_unittest.cc b/media/base/key_systems_unittest.cc |
index 596cc9bf1449ff717b1b42213d3c596eb00e1604..b8dac94b9c58a90e8450c9f37a6321929a9558ee 100644 |
--- a/media/base/key_systems_unittest.cc |
+++ b/media/base/key_systems_unittest.cc |
@@ -17,7 +17,6 @@ |
#include "media/base/key_systems.h" |
#include "media/base/media.h" |
#include "media/base/media_client.h" |
-#include "ppapi/features/features.h" |
#include "testing/gtest/include/gtest/gtest.h" |
namespace media { |
@@ -424,7 +423,7 @@ |
EXPECT_EQ("Unknown", GetKeySystemNameForUMA(kUnrecognized)); |
EXPECT_FALSE(CanUseAesDecryptor(kUnrecognized)); |
-#if BUILDFLAG(ENABLE_PEPPER_CDMS) |
+#if defined(ENABLE_PEPPER_CDMS) |
std::string type; |
#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON) |
EXPECT_DEATH(type = GetPepperType(kUnrecognized), |
@@ -443,7 +442,7 @@ |
EXPECT_EQ("UseAes", GetKeySystemNameForUMA(kUsesAes)); |
EXPECT_TRUE(CanUseAesDecryptor(kUsesAes)); |
-#if BUILDFLAG(ENABLE_PEPPER_CDMS) |
+#if defined(ENABLE_PEPPER_CDMS) |
std::string type; |
#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON) |
EXPECT_DEATH(type = GetPepperType(kUsesAes), |
@@ -600,9 +599,9 @@ |
kVideoWebM, no_codecs(), kExternal)); |
EXPECT_FALSE(CanUseAesDecryptor(kExternal)); |
-#if BUILDFLAG(ENABLE_PEPPER_CDMS) |
+#if defined(ENABLE_PEPPER_CDMS) |
EXPECT_EQ("application/x-ppapi-external-cdm", GetPepperType(kExternal)); |
-#endif // BUILDFLAG(ENABLE_PEPPER_CDMS) |
+#endif // defined(ENABLE_PEPPER_CDMS) |
} |
TEST_F( |