Encrypted Media: Implement IPC based SetCdm().

content/renderer/media/android/webmediaplayer_android.h

Index: content/renderer/media/android/webmediaplayer_android.h
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h
index 3ccf5ce9d22576ba753068cdf8b3fc0a8c0b11ff..9deda82f662c939c83efbd84930d7a559804b023 100644
--- a/content/renderer/media/android/webmediaplayer_android.h
+++ b/content/renderer/media/android/webmediaplayer_android.h
@@ -36,6 +36,7 @@ class MessageLoopProxy;
 }
 
 namespace blink {
+class WebContentDecryptionModule;
 class WebFrame;
 class WebURL;
 }
@@ -53,8 +54,9 @@ class WebLayerImpl;
 }
 
 namespace content {
-class WebMediaPlayerDelegate;
 class RendererMediaPlayerManager;
+class WebContentDecryptionModuleImpl;
+class WebMediaPlayerDelegate;
 
 // This class implements blink::WebMediaPlayer by keeping the android
 // media player in the browser process. It listens to all the status changes
@@ -214,6 +216,8 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
   virtual MediaKeyException cancelKeyRequest(
       const blink::WebString& key_system,
       const blink::WebString& session_id);
+  virtual void setContentDecryptionModule(
+      blink::WebContentDecryptionModule* cdm);
 
   void OnKeyAdded(const std::string& session_id);
   void OnKeyError(const std::string& session_id,
@@ -427,11 +431,16 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
   // through GenerateKeyRequest() directly from WebKit.
   std::string init_data_type_;
 
-  media::DecryptorReadyCB decryptor_ready_cb_;
-
   // Manages decryption keys and decrypts encrypted frames.
   scoped_ptr<ProxyDecryptor> proxy_decryptor_;
 
+  // Non-owned pointer to the CDM. Updated via calls to
+  // setContentDecryptionModule().
+  WebContentDecryptionModuleImpl* web_cdm_;
+
+  // Used by clear key implementation.

[ddorwin, 2014/03/25 23:03:59]

Can we improve this comment? It's not clear why (and is rather unexpected).
nit: Capitalize Clear Key.
Should there be a TODO to clean up as we discussed in PS1?

[xhwang, 2014/03/26 06:02:04]

Done
Hmm, I can't remember which clean up we discussed in PS1... Any hint?

+  media::DecryptorReadyCB decryptor_ready_cb_;
+
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;