Connect WebMediaPlayerImpl to WebContentDecryptionModuleImpl for EME WD (Chromium side)

content/renderer/media/webmediaplayer_impl.h

Index: content/renderer/media/webmediaplayer_impl.h
diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h
index 50ee39b14291eec5ec4097a7a84626d53098a756..503388f67406005346ec2ee9e21767af351ebab3 100644
--- a/content/renderer/media/webmediaplayer_impl.h
+++ b/content/renderer/media/webmediaplayer_impl.h
@@ -47,6 +47,7 @@
 class RenderAudioSourceProvider;
 
 namespace blink {
+class WebContentDecryptionModule;
 class WebFrame;
 }
 
@@ -67,6 +68,7 @@ class WebLayerImpl;
 namespace content {
 class BufferedDataSource;
 class WebAudioSourceProviderImpl;
+class WebContentDecryptionModuleImpl;
 class WebMediaPlayerDelegate;
 class WebMediaPlayerParams;
 class WebTextTrackImpl;
@@ -175,6 +177,9 @@ class WebMediaPlayerImpl
       const blink::WebString& key_system,
       const blink::WebString& session_id);
 
+  virtual void contentDecryptionModuleChanged(
+      blink::WebContentDecryptionModule* cdm);
+
   // content::RenderViewObserver implementation.
   virtual void OnDestruct() OVERRIDE;
 
@@ -373,6 +378,10 @@ class WebMediaPlayerImpl
   // Text track objects get a unique index value when they're created.
   int text_track_index_;
 
+  // Non-owned pointer to the CDM. Updated via calls to
+  // contentDecryptionModuleChanged().
+  WebContentDecryptionModuleImpl* cdm_;

[ddorwin, 2013/12/20 05:26:14]

Because we have multiple levels of CDM, it might be helpful to call this
web_cdm_. WDYT?

[jrummell, 2013/12/20 23:32:10]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };