Disable unprefixed EME when using "--mediadrm-enable-non-compositing".

chromecast/browser/cast_browser_main_parts.cc

 // Copyright 2014 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.
 
 #include "chromecast/browser/cast_browser_main_parts.h"
 
 #include <signal.h>
 #include <sys/prctl.h>
 
 #include "base/command_line.h"
@@ skipping 77 matching lines @@
 namespace shell {
 
 namespace {
 
 struct DefaultCommandLineSwitch {
   const char* const switch_name;
   const char* const switch_value;
 };
 
 DefaultCommandLineSwitch g_default_switches[] = {
+  // TODO(ddorwin): Develop a permanent solution. See http://crbug.com/394926.
+  // For now, disable unprefixed EME because the video behavior not be
+  // consistent with other clients.
+  { switches::kDisableEncryptedMedia, ""},
 #if defined(OS_ANDROID)
   { switches::kMediaDrmEnableNonCompositing, ""},
   { switches::kEnableOverlayFullscreenVideo, ""},
   { switches::kDisableInfobarForProtectedMediaIdentifier, ""},
   { switches::kDisableGestureRequirementForMediaPlayback, ""},
   { switches::kForceUseOverlayEmbeddedVideo, ""},
 #endif
   // Always enable HTMLMediaElement logs.
   { switches::kBlinkPlatformLogChannels, "Media"},
 #if defined(DISABLE_DISPLAY)
@@ skipping 150 matching lines @@
 }
 
 void CastBrowserMainParts::PostMainMessageLoopRun() {
   cast_browser_process_->cast_service()->Finalize();
   cast_browser_process_->metrics_service_client()->Finalize();
   cast_browser_process_.reset();
 }
 
 }  // namespace shell
 }  // namespace chromecast