media: Support creation and SetCdm() for mojo based CDM.

media/mojo/services/mojo_cdm.h

Index: media/mojo/services/mojo_cdm.h
diff --git a/media/mojo/services/mojo_cdm.h b/media/mojo/services/mojo_cdm.h
index 1f66b055131526c837d8ff10e0ed1d9ad40fc427..c35a193c55f031c23815326cb5d2a6ea3d4da9d3 100644
--- a/media/mojo/services/mojo_cdm.h
+++ b/media/mojo/services/mojo_cdm.h
@@ -7,6 +7,7 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "media/base/cdm_context.h"
 #include "media/base/media_keys.h"
 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
 #include "media/mojo/services/mojo_type_trait.h"
@@ -20,11 +21,14 @@ namespace media {
 // A MediaKeys that proxies to a mojo::ContentDecryptionModule. That
 // mojo::ContentDecryptionModule proxies back to the MojoCdm via the
 // mojo::ContentDecryptionModuleClient interface.
-class MojoCdm : public MediaKeys, public mojo::ContentDecryptionModuleClient {
+class MojoCdm : public MediaKeys,
+                public CdmContext,
+                public mojo::ContentDecryptionModuleClient {
  public:
   // |media_renderer_provider| is a ServiceProvider from a connected
   //     Application that is hosting a mojo::MediaRenderer.
   MojoCdm(mojo::ContentDecryptionModulePtr remote_cdm,
+          int32_t cdm_id,
           const SessionMessageCB& session_message_cb,
           const SessionClosedCB& session_closed_cb,
           const SessionErrorCB& session_error_cb,
@@ -53,6 +57,10 @@ class MojoCdm : public MediaKeys, public mojo::ContentDecryptionModuleClient {
                      scoped_ptr<SimpleCdmPromise> promise) final;
   CdmContext* GetCdmContext() final;
 
+  // CdmContext implementation.
+  media::Decryptor* GetDecryptor() final;
+  int GetCdmId() const final;
+
  private:
   // mojo::ContentDecryptionModuleClient implementation.
   void OnSessionMessage(const mojo::String& session_id,
@@ -76,6 +84,8 @@ class MojoCdm : public MediaKeys, public mojo::ContentDecryptionModuleClient {
 
   mojo::ContentDecryptionModulePtr remote_cdm_;
 
+  const int32_t cdm_id_;
+
   // Callbacks for firing session events.
   SessionMessageCB session_message_cb_;
   SessionClosedCB session_closed_cb_;