media: Use bundled Widevine CDM in encrypted media browser tests

chrome/browser/media/encrypted_media_browsertest.cc

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(); }

[ddorwin, 2016/05/20 16:56:15]

What are the test performance impacts? Should we put this inside
ENABLE_PEPPER_CDMS?

[xhwang, 2016/05/20 21:23:28]

I suppose we'll load existing components, then before we really try to do update
(in ~6 mins), the test should already finished.

Putting them in ENABLE_PEPPER_CDMS makes sense. Done.

But I think long term we shouldn't disable loading existing components at all
for better test coverage. See issue 613581.

 
   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)
   }
 };