media: Use bundled Widevine CDM in encrypted media browser tests

chrome/browser/content_settings/content_settings_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 302 matching lines @@
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   EXPECT_TRUE(TabSpecificContentSettings::FromWebContents(web_contents)->
       IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
 }
 
 #if defined(ENABLE_PLUGINS)
 class PepperContentSettingsSpecialCasesTest : public ContentSettingsTest {
+ public:
+  PepperContentSettingsSpecialCasesTest() { enable_component_update(); }

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

Ditto with next comment, especially since this will not be necessary once the
related CDM product code is no longer necessary.

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

Done.

+
  protected:
   // Registers any CDM plugins not registered by default.
   void SetUpCommandLine(base::CommandLine* command_line) override {
 #if defined(ENABLE_PEPPER_CDMS)
     // Append the switch to register the External Clear Key CDM.
     base::FilePath::StringType pepper_plugins = BuildPepperCdmRegistration(
         kClearKeyCdmBaseDirectory, kClearKeyCdmAdapterFileName,
         kClearKeyCdmDisplayName, kClearKeyCdmPepperMimeType);
-#if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
-    // The CDM must be registered when it is a component.
-    pepper_plugins.append(FILE_PATH_LITERAL(","));
-    pepper_plugins.append(BuildPepperCdmRegistration(
-        kWidevineCdmBaseDirectory, kWidevineCdmAdapterFileName,
-        kWidevineCdmDisplayName, kWidevineCdmPluginMimeType));
-#endif  // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
     command_line->AppendSwitchNative(switches::kRegisterPepperPlugins,
                                      pepper_plugins);
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 #if !defined(DISABLE_NACL)
     // Ensure NaCl can run.
     command_line->AppendSwitch(switches::kEnableNaCl);
 #endif
   }
 
@@ skipping 154 matching lines @@
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 #if !defined(DISABLE_NACL)
 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest,
                        NaCl) {
   RunJavaScriptBlockedTest("load_nacl_no_js.html", true);
 }
 #endif  // !defined(DISABLE_NACL)
 
 #endif  // defined(ENABLE_PLUGINS)