Connect WebMediaPlayerImpl to WebContentDecryptionModuleImpl for EME WD (Chromium side)

content/renderer/media/webmediaplayer_impl.cc

Index: content/renderer/media/webmediaplayer_impl.cc
diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc
index ee637a6879a20a4af3f0f904c8faf60ead91dc80..a5963c6db84df1e1fa2c61c3b4b570686d4d48cc 100644
--- a/content/renderer/media/webmediaplayer_impl.cc
+++ b/content/renderer/media/webmediaplayer_impl.cc
@@ -24,6 +24,7 @@
 #include "content/renderer/media/crypto/key_systems.h"
 #include "content/renderer/media/texttrack_impl.h"
 #include "content/renderer/media/webaudiosourceprovider_impl.h"
+#include "content/renderer/media/webcontentdecryptionmodule_impl.h"
 #include "content/renderer/media/webinbandtexttrack_impl.h"
 #include "content/renderer/media/webmediaplayer_delegate.h"
 #include "content/renderer/media/webmediaplayer_params.h"
@@ -50,6 +51,7 @@
 #include "media/filters/opus_audio_decoder.h"
 #include "media/filters/video_renderer_impl.h"
 #include "media/filters/vpx_video_decoder.h"
+#include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
 #include "third_party/WebKit/public/platform/WebMediaSource.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
@@ -162,7 +164,8 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
       pending_repaint_(false),
       pending_size_change_(false),
       video_frame_provider_client_(NULL),
-      text_track_index_(0) {
+      text_track_index_(0),
+      web_cdm_(0) {

[xhwang, 2013/12/30 19:50:49]

s/0/NULL

[jrummell, 2014/01/08 19:12:31]

Done. WebKit presubmit checks complain about NULL, so I changed them all. Not
needed here.

   media_log_->AddEvent(
       media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
 
@@ -853,6 +856,13 @@ WebMediaPlayerImpl::CancelKeyRequestInternal(
   return WebMediaPlayer::MediaKeyExceptionNoError;
 }
 
+void WebMediaPlayerImpl::setContentDecryptionModule(
+    blink::WebContentDecryptionModule* cdm) {
+  web_cdm_ = toWebContentDecryptionModuleImpl(cdm);
+  // TODO(jrummell): use web_cdm_->getDecryptor() instead of creating
+  // ProxyDecryptor().
+}
+
 void WebMediaPlayerImpl::OnDestruct() {
   Destroy();
 }