Encrypted Media: Implement IPC based SetCdm().

content/renderer/media/cdm_session_adapter.cc

Index: content/renderer/media/cdm_session_adapter.cc
diff --git a/content/renderer/media/cdm_session_adapter.cc b/content/renderer/media/cdm_session_adapter.cc
index b77cb3805dd58da15d8dd0097ba28b08925ae890..cf8d849771c990a806bced8505c1fb2e5bf1837d 100644
--- a/content/renderer/media/cdm_session_adapter.cc
+++ b/content/renderer/media/cdm_session_adapter.cc
@@ -26,7 +26,9 @@ CdmSessionAdapter::~CdmSessionAdapter() {}
 bool CdmSessionAdapter::Initialize(
 #if defined(ENABLE_PEPPER_CDMS)
     const CreatePepperCdmCB& create_pepper_cdm_cb,
-#endif
+#elif defined(OS_ANDROID)
+    int* cdm_id,
+#endif  // defined(ENABLE_PEPPER_CDMS)
     const std::string& key_system) {
   base::WeakPtr<CdmSessionAdapter> weak_this = weak_ptr_factory_.GetWeakPtr();
   media_keys_ =
@@ -37,9 +39,9 @@ bool CdmSessionAdapter::Initialize(
 #elif defined(OS_ANDROID)
           // TODO(xhwang): Support Android.
           NULL,
-          0,
           // TODO(ddorwin): Get the URL for the frame containing the MediaKeys.
           GURL(),
+          cdm_id,
 #endif  // defined(ENABLE_PEPPER_CDMS)
           base::Bind(&CdmSessionAdapter::OnSessionCreated, weak_this),
           base::Bind(&CdmSessionAdapter::OnSessionMessage, weak_this),