Update MediaKeys interface for EME

content/renderer/media/crypto/proxy_media_keys.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_CRYPTO_PROXY_MEDIA_KEYS_H_
 #define CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_
 
 #include <map>
 #include <string>
 
@@ skipping 10 matching lines @@
 class RendererCdmManager;
 
 // A MediaKeys proxy that wraps the EME part of RendererCdmManager.
 class ProxyMediaKeys : public media::MediaKeys {
  public:
   static scoped_ptr<ProxyMediaKeys> Create(
       const std::string& key_system,
       const GURL& security_origin,
       RendererCdmManager* manager,
       const media::SessionMessageCB& session_message_cb,
       const media::SessionReadyCB& session_ready_cb,

[ddorwin, 2014/09/10 22:58:38]

What about adding the CB support? TODO?

[jrummell, 2014/09/11 21:21:55]

Added them along with a TODO. Much more work is required on the Android side.

       const media::SessionClosedCB& session_closed_cb,
       const media::SessionErrorCB& session_error_cb);
 
   virtual ~ProxyMediaKeys();
 
   // MediaKeys implementation.
+  virtual void SetServerCertificate(
+      const uint8* certificate_data,
+      int certificate_data_length,
+      scoped_ptr<media::SimpleCdmPromise> promise) OVERRIDE;
   virtual void CreateSession(
       const std::string& init_data_type,
       const uint8* init_data,
       int init_data_length,
       SessionType session_type,
       scoped_ptr<media::NewSessionCdmPromise> promise) OVERRIDE;
   virtual void LoadSession(
       const std::string& web_session_id,
       scoped_ptr<media::NewSessionCdmPromise> promise) OVERRIDE;
   virtual void UpdateSession(
       const std::string& web_session_id,
       const uint8* response,
       int response_length,
       scoped_ptr<media::SimpleCdmPromise> promise) OVERRIDE;
-  virtual void ReleaseSession(
+  virtual void CloseSession(
       const std::string& web_session_id,
       scoped_ptr<media::SimpleCdmPromise> promise) OVERRIDE;
+  virtual void RemoveSession(
+      const std::string& web_session_id,
+      scoped_ptr<media::SimpleCdmPromise> promise) OVERRIDE;
+  virtual void GetUsableKeyIds(
+      const std::string& web_session_id,
+      scoped_ptr<media::KeyIdsPromise> promise) OVERRIDE;
 
   // Callbacks.
   void OnSessionCreated(uint32 session_id, const std::string& web_session_id);
   void OnSessionMessage(uint32 session_id,
                         const std::vector<uint8>& message,
                         const GURL& destination_url);
   void OnSessionReady(uint32 session_id);
   void OnSessionClosed(uint32 session_id);
   void OnSessionError(uint32 session_id,
                       media::MediaKeys::KeyError error_code,
@@ skipping 53 matching lines @@
 
   // Keep track of outstanding promises. This map owns the promise object.
   PromiseMap session_id_to_promise_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyMediaKeys);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_