Index: content/browser/android/content_startup_flags.cc |
diff --git a/content/browser/android/content_startup_flags.cc b/content/browser/android/content_startup_flags.cc |
index 3e0ee61af2a669a87247093f83b65e7f94af0c20..6a8e495ff1becc4d4b7c1d1488ed51fa93919254 100644 |
--- a/content/browser/android/content_startup_flags.cc |
+++ b/content/browser/android/content_startup_flags.cc |
@@ -11,6 +11,7 @@ |
#include "content/public/browser/render_process_host.h" |
#include "content/public/common/content_constants.h" |
#include "content/public/common/content_switches.h" |
+#include "media/base/media_switches.h" |
#include "ui/base/ui_base_switches.h" |
namespace content { |
@@ -67,6 +68,14 @@ void SetContentCommandLineFlags(int max_render_process_count) { |
parsed_command_line->AppendSwitch(switches::kEnableFixedLayout); |
parsed_command_line->AppendSwitch(switches::kEnableViewport); |
+#if defined(GOOGLE_TV) |
+ // Cdm plugin should run out of proces |
+ // Will remove this part, when "out-of-process" becomes default. |
+ parsed_command_line->AppendSwitch(switches::kPpapiOutOfProcess); |
+ |
+ parsed_command_line->AppendSwitch(switches::kEnableEncryptedMedia); |
+#endif |
+ |
// FIXME(aelias): Commented out due to flaky tests. |
// parsed_command_line->AppendSwitch( |
// cc::switches::kEnableCompositorFrameMessage); |