Rename switch to disable prefixed Encrypted Media APIs.

content/renderer/render_thread_impl.cc

Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index cfeabd128acb02fc9b99fbef99e076b9ee2406de..314407f3b4f77434976da89f5bfdd441dcdbc739 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -78,7 +78,6 @@
 #include "ipc/ipc_platform_file.h"
 #include "media/base/audio_hardware_config.h"
 #include "media/base/media.h"
-#include "media/base/media_switches.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
@@ -638,6 +637,8 @@ void RenderThreadImpl::WidgetRestored() {
 static void AdjustRuntimeFeatureDefaultsForPlatform() {
 #if defined(OS_ANDROID) && !defined(GOOGLE_TV)
   WebRuntimeFeatures::enableWebKitMediaSource(false);
+  WebRuntimeFeatures::enableLegacyEncryptedMedia(false);
+  WebRuntimeFeatures::enableEncryptedMedia(false);
 #endif
 
 #if defined(OS_ANDROID)
@@ -690,8 +691,11 @@ static void AdjustRuntimeFeaturesFromArgs(const CommandLine& command_line) {
   if (command_line.HasSwitch(switches::kDisableFullScreen))
     WebRuntimeFeatures::enableFullscreen(false);
 
-  if (command_line.HasSwitch(switches::kDisableEncryptedMedia))
-    WebRuntimeFeatures::enableEncryptedMedia(false);
+  if (command_line.HasSwitch(switches::kEnableEncryptedMedia))
+    WebRuntimeFeatures::enableEncryptedMedia(true);
+
+  if (command_line.HasSwitch(switches::kDisableLegacyEncryptedMedia))
+    WebRuntimeFeatures::enableLegacyEncryptedMedia(false);
 
 #if defined(OS_ANDROID)
   if (command_line.HasSwitch(switches::kEnableWebAudio))