summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/renderer/render_process.cc5
-rw-r--r--webkit/tools/test_shell/test_shell_main.cc5
2 files changed, 10 insertions, 0 deletions
diff --git a/chrome/renderer/render_process.cc b/chrome/renderer/render_process.cc
index 1333af7..853693b 100644
--- a/chrome/renderer/render_process.cc
+++ b/chrome/renderer/render_process.cc
@@ -105,6 +105,11 @@ bool RenderProcess::GlobalInit(const std::wstring &channel_name) {
#endif
}
+ if (command_line.HasSwitch(switches::kEnableVideo)) {
+ // TODO(scherkus): check for any DLL dependencies.
+ webkit_glue::SetMediaPlayerAvailable(true);
+ }
+
ChildProcessFactory<RenderProcess> factory;
return ChildProcess::GlobalInit(channel_name, &factory);
}
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 262c97b..08b8c07 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -214,6 +214,11 @@ int main(int argc, char* argv[]) {
base::MemoryDebug::DumpAllMemoryInUse();
}
+ if (parsed_command_line.HasSwitch(test_shell::kEnableVideo)) {
+ // TODO(scherkus): check for any DLL dependencies.
+ webkit_glue::SetMediaPlayerAvailable(true);
+ }
+
// See if we need to run the tests.
if (layout_test_mode) {
// Set up for the kind of test requested.