Rename switch to disable prefixed Encrypted Media APIs.

content/renderer/render_thread_impl.cc

 // Copyright (c) 2012 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 "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 60 matching lines @@
 #include "content/renderer/render_process_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
 #include "content/renderer/skia_benchmarking_extension.h"
 #include "grit/content_resources.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_forwarding_message_filter.h"
 #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"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebColorName.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifier.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h"
@@ skipping 539 matching lines @@
   if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) {
     return;
   }
 
   ScheduleIdleHandler(kLongIdleHandlerDelayMs);
 }
 
 static void AdjustRuntimeFeatureDefaultsForPlatform() {
 #if defined(OS_ANDROID) && !defined(GOOGLE_TV)
   WebRuntimeFeatures::enableWebKitMediaSource(false);
+  WebRuntimeFeatures::enableLegacyEncryptedMedia(false);
+  WebRuntimeFeatures::enableEncryptedMedia(false);
 #endif
 
 #if defined(OS_ANDROID)
   WebRuntimeFeatures::enableWebAudio(false);
   // Web Speech API Speech recognition is not implemented on Android yet.
   WebRuntimeFeatures::enableScriptedSpeech(false);
   // Android does not support the Gamepad API.
   WebRuntimeFeatures::enableGamepad(false);
   // input[type=week] in Android is incomplete. crbug.com/135938
   WebRuntimeFeatures::enableInputTypeWeek(false);
@@ skipping 32 matching lines @@
 #endif
 
 #if defined(OS_ANDROID)
   if (command_line.HasSwitch(switches::kDisableWebRTC))
     WebRuntimeFeatures::enablePeerConnection(false);
 #endif
 
   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))
     WebRuntimeFeatures::enableWebAudio(true);
 #else
   if (command_line.HasSwitch(switches::kDisableWebAudio))
     WebRuntimeFeatures::enableWebAudio(false);
 #endif
 
   if (command_line.HasSwitch(switches::kEnableWebMIDI))
@@ skipping 612 matching lines @@
 
 void RenderThreadImpl::SetFlingCurveParameters(
     const std::vector<float>& new_touchpad,
     const std::vector<float>& new_touchscreen) {
   webkit_platform_support_->SetFlingCurveParameters(new_touchpad,
                                                     new_touchscreen);
 
 }
 
 }  // namespace content