Encrypted Media: Implement IPC based SetCdm().

content/renderer/media/webcontentdecryptionmodule_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 29 matching lines @@
       const base::string16& key_system);
 
   virtual ~WebContentDecryptionModuleImpl();
 
   // Returns the Decryptor associated with this CDM. May be NULL if no
   // Decryptor associated with the MediaKeys object.
   // TODO(jrummell): Figure out lifetimes, as WMPI may still use the decryptor
   // 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);
 };
 
 // Allow typecasting from blink type as this is the only implementation.
 inline WebContentDecryptionModuleImpl* ToWebContentDecryptionModuleImpl(
     blink::WebContentDecryptionModule* cdm) {
   return static_cast<WebContentDecryptionModuleImpl*>(cdm);
 }
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_