| Index: content/browser/zygote_host/zygote_communication_linux.cc
|
| diff --git a/content/browser/zygote_host/zygote_communication_linux.cc b/content/browser/zygote_host/zygote_communication_linux.cc
|
| index 475548254a5e554a3b29597e7fe392f6ce932625..0bfeb1b491975f913df43007a7e02c3a6d45bef1 100644
|
| --- a/content/browser/zygote_host/zygote_communication_linux.cc
|
| +++ b/content/browser/zygote_host/zygote_communication_linux.cc
|
| @@ -22,6 +22,7 @@
|
| #include "content/public/common/content_client.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "content/public/common/result_codes.h"
|
| +#include "media/base/media_switches.h"
|
| #include "ui/display/display_switches.h"
|
| #include "ui/gfx/switches.h"
|
|
|
| @@ -250,8 +251,7 @@ void ZygoteCommunication::Init() {
|
| // Should this list be obtained from browser_render_process_host.cc?
|
| static const char* const kForwardSwitches[] = {
|
| switches::kAllowSandboxDebugging, switches::kAndroidFontsPath,
|
| - switches::kDisableSeccompFilterSandbox,
|
| - switches::kEnableHeapProfiling,
|
| + switches::kDisableSeccompFilterSandbox, switches::kEnableHeapProfiling,
|
| switches::kEnableLogging, // Support, e.g., --enable-logging=stderr.
|
| // Need to tell the zygote that it is headless so that we don't try to use
|
| // the wrong type of main delegate.
|
| @@ -261,6 +261,8 @@ void ZygoteCommunication::Init() {
|
| switches::kForceDeviceScaleFactor, switches::kLoggingLevel,
|
| switches::kNoSandbox, switches::kPpapiInProcess,
|
| switches::kRegisterPepperPlugins, switches::kV, switches::kVModule,
|
| + // Need to tell CdmHostFile(s) to ignore missing CDM host files in tests.
|
| + switches::kIgnoreMissingCdmHostFileForTesting,
|
| };
|
| cmd_line.CopySwitchesFrom(browser_command_line, kForwardSwitches,
|
| arraysize(kForwardSwitches));
|
|
|