| 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..4e6be53ed76becc2778f2fa7dcc675fe9699b498 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) && 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) && 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)
|
| 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) && defined(WIDEVINE_CDM_IS_COMPONENT)
|
| // Widevine not supported because extra key system isn't enabled.
|
| EXPECT_FALSE(ContainsWidevine(key_systems_info));
|
|
|
|
|