Encrypted Media: Implement IPC based SetCdm().

content/renderer/media/webcontentdecryptionmodule_impl.h

Index: content/renderer/media/webcontentdecryptionmodule_impl.h
diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.h b/content/renderer/media/webcontentdecryptionmodule_impl.h
index d799664bf632065937207e780f4d0dbc55c74182..5f280eeed17928bdafb04056f11f55a6eec2f42b 100644
--- a/content/renderer/media/webcontentdecryptionmodule_impl.h
+++ b/content/renderer/media/webcontentdecryptionmodule_impl.h
@@ -47,16 +47,32 @@ class WebContentDecryptionModuleImpl
   // after WebContentDecryptionModule is freed. http://crbug.com/330324
   media::Decryptor* GetDecryptor();
 
+#if defined(OS_ANDROID)
+  // Returns the CDM ID associated with this object. May be kInvalidCdmId if no
+  // CDM ID is associated.

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

Ditto about why this might happen.

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

ditto

+  int GetCdmId();
+#endif  // defined(OS_ANDROID)
+
   // blink::WebContentDecryptionModule implementation.
   virtual blink::WebContentDecryptionModuleSession* createSession(
       blink::WebContentDecryptionModuleSession::Client* client);
 
  private:
   // Takes reference to |adapter|.
-  WebContentDecryptionModuleImpl(scoped_refptr<CdmSessionAdapter> adapter);
+  WebContentDecryptionModuleImpl(
+#if defined(OS_ANDROID)
+      scoped_refptr<CdmSessionAdapter> adapter,
+      int cdm_id);

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

nit: if you flip the order, you only need to ifdef this line.

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

Obsolete in PS4.

+#else
+      scoped_refptr<CdmSessionAdapter> adapter);
+#endif
 
   scoped_refptr<CdmSessionAdapter> adapter_;
 
+#if defined(OS_ANDROID)
+  int cdm_id_;
+#endif  // defined(OS_ANDROID)
+
   DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleImpl);
 };