media: Use bundled Widevine CDM in encrypted media browser tests

chrome/test/base/in_process_browser_test.h

 // 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.
 
 #ifndef CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
 #define CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
 
 #include <memory>
 
 #include "base/compiler_specific.h"
@@ skipping 194 matching lines @@
 
   void set_open_about_blank_on_browser_launch(bool value) {
     open_about_blank_on_browser_launch_ = value;
   }
 
   // This must be called before RunTestOnMainThreadLoop() to have any effect.
   void set_multi_desktop_test(bool multi_desktop_test) {
     multi_desktop_test_ = multi_desktop_test;
   }
 
+  void enable_component_update() { enable_component_update_ = true; }
+
   // Runs accessibility checks and sets |error_message| if it fails.
   bool RunAccessibilityChecks(std::string* error_message);
 
  private:
   // Creates a user data directory for the test if one is needed. Returns true
   // if successful.
   virtual bool CreateUserDataDirectory() WARN_UNUSED_RESULT;
 
   // Quits all open browsers and waits until there are no more browsers.
   void QuitBrowsers();
 
   // Prepare command line that will be used to launch the child browser process
   // with an in-process test.
   void PrepareTestCommandLine(base::CommandLine* command_line);

[Paweł Hajdan Jr., 2016/05/24 20:45:40]

How about we make this method virtual and override it in tests?

I'd prefer not to have one-off "hacks" for things like this (even though I see
some similar ones have apparently made it to this code).

You can then remove flags in a way similar to
src/chrome/browser/process_singleton_browsertest.cc :

    // Add the normal test-mode switches, except for the ones we're adding
    // ourselves.
    base::CommandLine standard_switches(base::CommandLine::NO_PROGRAM);
    test_launcher_utils::PrepareBrowserCommandLineForTests(&standard_switches);
    const base::CommandLine::SwitchMap& switch_map =
        standard_switches.GetSwitches();
    for (base::CommandLine::SwitchMap::const_iterator i = switch_map.begin();
         i != switch_map.end(); ++i) {
      const std::string& switch_name = i->first;
      if (switch_name == switches::kUserDataDir ||
          switch_name == switches::kForceFirstRun ||
          switch_name == switches::kNoFirstRun)
        continue;

      command_line.AppendSwitchNative(switch_name, i->second);
    }

WDYT?

[xhwang, 2016/05/24 21:16:30]

Thanks for the comment. Let me give it a try.

[xhwang, 2016/05/25 06:42:38]

Done.

 
   // Browser created from CreateBrowser.
   Browser* browser_;
 
   // Temporary user data directory. Used only when a user data directory is not
   // specified in the command line.
   base::ScopedTempDir temp_user_data_dir_;
 
   // True if we should exit the tests after the last browser instance closes.
   bool exit_when_last_browser_closes_;
 
   // True if the about:blank tab should be opened when the browser is launched.
   bool open_about_blank_on_browser_launch_;
 
   // True if this is a multi-desktop test (in which case this browser test will
   // not ensure that Browsers are only created on the tested desktop).
   bool multi_desktop_test_;
 
   // True if the accessibility test should run for a particular test case.
   // This is reset for every test case.
   bool run_accessibility_checks_for_test_case_;
 
+  bool enable_component_update_;
+
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool* autorelease_pool_;
   std::unique_ptr<ScopedBundleSwizzlerMac> bundle_swizzler_;
 #endif  // OS_MACOSX
 
 #if defined(OS_WIN)
   std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_;
 #endif
 };
 
 #endif  // CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_