Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Unified Diff: media/base/key_systems_unittest.cc

Issue 2411433002: Move ENABLE_PEPPER_CDMS to a buildflag header. (Closed)
Patch Set: Fixes Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/key_systems.cc ('k') | media/blink/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/key_systems_unittest.cc
diff --git a/media/base/key_systems_unittest.cc b/media/base/key_systems_unittest.cc
index b8dac94b9c58a90e8450c9f37a6321929a9558ee..596cc9bf1449ff717b1b42213d3c596eb00e1604 100644
--- a/media/base/key_systems_unittest.cc
+++ b/media/base/key_systems_unittest.cc
@@ -17,6 +17,7 @@
#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 {
@@ -423,7 +424,7 @@ TEST_F(KeySystemsTest, Basic_UnrecognizedKeySystem) {
EXPECT_EQ("Unknown", GetKeySystemNameForUMA(kUnrecognized));
EXPECT_FALSE(CanUseAesDecryptor(kUnrecognized));
-#if defined(ENABLE_PEPPER_CDMS)
+#if BUILDFLAG(ENABLE_PEPPER_CDMS)
std::string type;
#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
EXPECT_DEATH(type = GetPepperType(kUnrecognized),
@@ -442,7 +443,7 @@ TEST_F(KeySystemsTest, Basic_UsesAesDecryptor) {
EXPECT_EQ("UseAes", GetKeySystemNameForUMA(kUsesAes));
EXPECT_TRUE(CanUseAesDecryptor(kUsesAes));
-#if defined(ENABLE_PEPPER_CDMS)
+#if BUILDFLAG(ENABLE_PEPPER_CDMS)
std::string type;
#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
EXPECT_DEATH(type = GetPepperType(kUsesAes),
@@ -599,9 +600,9 @@ TEST_F(KeySystemsTest, Basic_ExternalDecryptor) {
kVideoWebM, no_codecs(), kExternal));
EXPECT_FALSE(CanUseAesDecryptor(kExternal));
-#if defined(ENABLE_PEPPER_CDMS)
+#if BUILDFLAG(ENABLE_PEPPER_CDMS)
EXPECT_EQ("application/x-ppapi-external-cdm", GetPepperType(kExternal));
-#endif // defined(ENABLE_PEPPER_CDMS)
+#endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
}
TEST_F(
« no previous file with comments | « media/base/key_systems.cc ('k') | media/blink/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698