Encrypted Media: Check WebKit::WebRuntimeFeatures::isEncryptedMediaEnabled() in WebMediaPlayerImpl.

webkit/media/webmediaplayer_impl.cc

Index: webkit/media/webmediaplayer_impl.cc
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 9723499bd37f772fee08b4bbaae2bac805b4308b..aa936f51162ef556a1cd7790ad4cb90235455b6d 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -26,6 +26,7 @@
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/chunk_demuxer.h"
 #include "media/filters/video_renderer_base.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
@@ -187,8 +188,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
   filter_collection_->AddAudioRenderer(
       new media::AudioRendererImpl(new media::NullAudioSink()));
 
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
-  if (cmd_line->HasSwitch(switches::kEnableEncryptedMedia)) {
+  if (WebKit::WebRuntimeFeatures::isEncryptedMediaEnabled()) {

[scherkus (not reviewing), 2012/12/04 18:13:04]

where do we flip this bit on for DumpRenderTree vs. content/?

[xhwang, 2012/12/04 18:25:20]

In DumpRenderTree it's set here:
http://code.google.com/searchframe#OAMlx_jo-ck/src/third_party/WebKit/Tools/D...

     decryptor_.reset(new ProxyDecryptor(message_loop_factory_->GetMessageLoop(
         media::MessageLoopFactory::kPipeline), proxy_.get(), client, frame));
   }