Encrypted Media: Implement IPC based SetCdm().

content/renderer/media/cdm_session_adapter.h

 // Copyright 2014 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_CDM_SESSION_ADAPTER_H_
 #define CONTENT_RENDERER_MEDIA_CDM_SESSION_ADAPTER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 15 matching lines @@
 // appropriate session object. Callers should hold references to this class
 // as long as they need the CDM instance.
 class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
  public:
   CdmSessionAdapter();
 
   // Returns true on success.
   bool Initialize(
 #if defined(ENABLE_PEPPER_CDMS)
       const CreatePepperCdmCB& create_pepper_cdm_cb,
-#endif
+#endif  // defined(ENABLE_PEPPER_CDMS)

[ddorwin, 2014/03/25 23:04:00]

nit: Comment not necessary for a simple ifdef.

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

Done.

       const std::string& key_system);
 
   // Creates a new session and adds it to the internal map. The caller owns the
   // created session. RemoveSession() must be called when destroying it.
   WebContentDecryptionModuleSessionImpl* CreateSession(
       blink::WebContentDecryptionModuleSession::Client* client);
 
   // Removes a session from the internal map.
   void RemoveSession(uint32 session_id);
 
@@ skipping 11 matching lines @@
 
   // Releases the session specified by |session_id|.
   void ReleaseSession(uint32 session_id);
 
   // Returns the Decryptor associated with this CDM. May be NULL if no
   // Decryptor is 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 the |media_keys_|. May be kInvalidCdmId
+  // if no CDM ID is associated.
+  int GetCdmId() const;
+#endif
+
  private:
   friend class base::RefCounted<CdmSessionAdapter>;
   typedef std::map<uint32, WebContentDecryptionModuleSessionImpl*> SessionMap;
 
   ~CdmSessionAdapter();
 
   // Callbacks for firing session events.
   void OnSessionCreated(uint32 session_id, const std::string& web_session_id);
   void OnSessionMessage(uint32 session_id,
                         const std::vector<uint8>& message,
                         const std::string& destination_url);
   void OnSessionReady(uint32 session_id);
   void OnSessionClosed(uint32 session_id);
   void OnSessionError(uint32 session_id,
                       media::MediaKeys::KeyError error_code,
                       uint32 system_code);
 
   // Helper function of the callbacks.
   WebContentDecryptionModuleSessionImpl* GetSession(uint32 session_id);
 
+  // Session ID should be unique per renderer process for debugging purposes.
+  static uint32 next_session_id_;
+
   scoped_ptr<media::MediaKeys> media_keys_;
 
   SessionMap sessions_;
 
-  // Session ID should be unique per renderer process for debugging purposes.
-  static uint32 next_session_id_;
+#if defined(OS_ANDROID)
+  int cdm_id_;
+#endif
 
-  // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<CdmSessionAdapter> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmSessionAdapter);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CDM_SESSION_ADAPTER_H_