Encrypted Media: Implement IPC based SetCdm().

content/renderer/media/cdm_session_adapter.h

Index: content/renderer/media/cdm_session_adapter.h
diff --git a/content/renderer/media/cdm_session_adapter.h b/content/renderer/media/cdm_session_adapter.h
index 611f25b5038cb12c99d83a1ddf4399e81fb9b429..8f445754aae02b69cbf25ec17dae29c6a14bf45e 100644
--- a/content/renderer/media/cdm_session_adapter.h
+++ b/content/renderer/media/cdm_session_adapter.h
@@ -33,7 +33,9 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
   bool 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);
 
   // Creates a new session and adds it to the internal map. The caller owns the
@@ -65,6 +67,10 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
   // after WebContentDecryptionModule is freed. http://crbug.com/330324
   media::Decryptor* GetDecryptor();
 
+  // Returns the CDM ID associated with the |media_keys_|. May be kInvalidCdmId
+  // if no CDM ID is associated.
+  int GetCdmId() const;
+
  private:
   friend class base::RefCounted<CdmSessionAdapter>;
   typedef std::map<uint32, WebContentDecryptionModuleSessionImpl*> SessionMap;
@@ -85,14 +91,14 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
   // Helper function of the callbacks.
   WebContentDecryptionModuleSessionImpl* GetSession(uint32 session_id);
 
-  scoped_ptr<media::MediaKeys> media_keys_;
+  // Session ID should be unique per renderer process for debugging purposes.
+  static uint32 next_session_id_;
 
-  base::WeakPtrFactory<CdmSessionAdapter> weak_ptr_factory_;
+  scoped_ptr<media::MediaKeys> media_keys_;
 
   SessionMap sessions_;
 
-  // Session ID should be unique per renderer process for debugging purposes.
-  static uint32 next_session_id_;
+  base::WeakPtrFactory<CdmSessionAdapter> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmSessionAdapter);
 };