| Index: chrome/browser/media/encrypted_media_browsertest.cc
|
| diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
|
| index c04916fbc4042036872b219847f435b5f8494c56..d6003247d3715d28a6bbaa81ad308330425def16 100644
|
| --- a/chrome/browser/media/encrypted_media_browsertest.cc
|
| +++ b/chrome/browser/media/encrypted_media_browsertest.cc
|
| @@ -98,7 +98,7 @@ static bool IsMSESupported() {
|
| // Base class for encrypted media tests.
|
| class EncryptedMediaTestBase : public MediaBrowserTest {
|
| public:
|
| - EncryptedMediaTestBase() {}
|
| + EncryptedMediaTestBase() { enable_component_update(); }
|
|
|
| bool IsExternalClearKey(const std::string& key_system) {
|
| if (key_system == kExternalClearKeyKeySystem)
|
| @@ -255,13 +255,6 @@ class EncryptedMediaTestBase : public MediaBrowserTest {
|
| kClearKeyCdmAdapterFileName, kClearKeyCdmDisplayName,
|
| kClearKeyCdmPepperMimeType);
|
| }
|
| -#if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
|
| - else if (IsWidevine(key_system)) { // NOLINT
|
| - RegisterPepperCdm(command_line, kWidevineCdmBaseDirectory,
|
| - kWidevineCdmAdapterFileName, kWidevineCdmDisplayName,
|
| - kWidevineCdmPluginMimeType);
|
| - }
|
| -#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
|
| #endif // defined(ENABLE_PEPPER_CDMS)
|
| }
|
| };
|
|
|