Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Unified Diff: content/browser/zygote_host/zygote_communication_linux.cc

Issue 2582463003: media: Verify CDM Host files (Closed)
Patch Set: comments addressed Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..3d564dab0899e8f3aedf221319b5334a7ee6ba70 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.
jam 2017/01/24 00:39:24 ditto
xhwang 2017/01/24 01:14:19 Done.
+ switches::kIgnoreMissingCdmHostFile,
};
cmd_line.CopySwitchesFrom(browser_command_line, kForwardSwitches,
arraysize(kForwardSwitches));

Powered by Google App Engine
This is Rietveld 408576698