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

Unified Diff: content/renderer/media/render_media_client_unittest.cc

Issue 772043004: Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix #endif Created 6 years 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 | « content/renderer/media/render_media_client.cc ('k') | third_party/widevine/cdm/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/render_media_client_unittest.cc
diff --git a/content/renderer/media/render_media_client_unittest.cc b/content/renderer/media/render_media_client_unittest.cc
index e796e46442312caae44d0098879db8035c26b0c1..f774791488624bebbad216d2513d651507dbafc7 100644
--- a/content/renderer/media/render_media_client_unittest.cc
+++ b/content/renderer/media/render_media_client_unittest.cc
@@ -25,7 +25,7 @@ class TestContentRendererClient : public ContentRendererClient {
void AddKeySystems(
std::vector<media::KeySystemInfo>* key_systems_info) override {
media::KeySystemInfo key_system_info("test.keysystem");
-#if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
+#if defined(ENABLE_WIDEVINE_CDM) && defined(WIDEVINE_CDM_IS_COMPONENT)
if (is_extra_key_system_enabled_)
key_systems_info->push_back(media::KeySystemInfo(kWidevineKeySystem));
#endif
@@ -38,7 +38,7 @@ class TestContentRendererClient : public ContentRendererClient {
bool is_extra_key_system_enabled_;
};
-#if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
+#if defined(ENABLE_WIDEVINE_CDM) && defined(WIDEVINE_CDM_IS_COMPONENT)
bool ContainsWidevine(
const std::vector<media::KeySystemInfo>& key_systems_info) {
for (const auto& key_system_info: key_systems_info) {
@@ -86,7 +86,7 @@ TEST_F(RenderMediaClientTest, KeySystemNameForUMA) {
clearkey_uma_name = info.key_system_name_for_uma;
}
-#if defined(WIDEVINE_CDM_AVAILABLE)
+#if defined(ENABLE_WIDEVINE_CDM)
EXPECT_EQ("Widevine", widevine_uma_name);
#else
EXPECT_TRUE(widevine_uma_name.empty());
@@ -112,7 +112,7 @@ TEST_F(RenderMediaClientTest, IsKeySystemsUpdateNeeded) {
// No update needed immediately after AddSupportedKeySystems() call.
EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded());
-#if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
+#if defined(ENABLE_WIDEVINE_CDM) && defined(WIDEVINE_CDM_IS_COMPONENT)
// Widevine not supported because extra key system isn't enabled.
EXPECT_FALSE(ContainsWidevine(key_systems_info));
« no previous file with comments | « content/renderer/media/render_media_client.cc ('k') | third_party/widevine/cdm/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698