Update MediaKeys interface for EME

media/base/media_keys.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 MEDIA_BASE_MEDIA_KEYS_H_
 #define MEDIA_BASE_MEDIA_KEYS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 54 matching lines @@
   enum SessionType {
     TEMPORARY_SESSION,
     PERSISTENT_SESSION
   };
 
   const static uint32 kInvalidSessionId = 0;
 
   MediaKeys();
   virtual ~MediaKeys();
 
+  // Provide a server certificate to be used to encrypt messages to the
+  // license server.
+  virtual void SetServerCertificate(const uint8* certificate_data,
+                                    int certificate_data_length,
+                                    scoped_ptr<SimpleCdmPromise> promise) = 0;
+
   // Creates a session with the |init_data_type|, |init_data| and |session_type|
   // provided.
   // Note: UpdateSession() and ReleaseSession() should only be called after
   // |promise| is resolved.
   virtual void CreateSession(const std::string& init_data_type,
                              const uint8* init_data,
                              int init_data_length,
                              SessionType session_type,
                              scoped_ptr<NewSessionCdmPromise> promise) = 0;
 
   // Loads a session with the |web_session_id| provided.
   // Note: UpdateSession() and ReleaseSession() should only be called after
   // |promise| is resolved.
   virtual void LoadSession(const std::string& web_session_id,
                            scoped_ptr<NewSessionCdmPromise> promise) = 0;
 
   // Updates a session specified by |web_session_id| with |response|.
   virtual void UpdateSession(const std::string& web_session_id,
                              const uint8* response,
                              int response_length,
                              scoped_ptr<SimpleCdmPromise> promise) = 0;
 
-  // Releases the session specified by |web_session_id|.
-  virtual void ReleaseSession(const std::string& web_session_id,
-                              scoped_ptr<SimpleCdmPromise> promise) = 0;
+  // Closes the session specified by |web_session_id|.
+  virtual void CloseSession(const std::string& web_session_id,
+                            scoped_ptr<SimpleCdmPromise> promise) = 0;
+
+  // Remove stored session data associated with the session specified by
+  // |web_session_id|.
+  virtual void RemoveSession(const std::string& web_session_id,
+                             scoped_ptr<SimpleCdmPromise> promise) = 0;
+
+  // Retrieve the key IDs for keys in the session that the CDM knows are
+  // currently usable to decrypt media data.
+  virtual void GetUsableKeyIds(const std::string& web_session_id,
+                               scoped_ptr<KeyIdsPromise> promise) = 0;
 
   // Gets the Decryptor object associated with the MediaKeys. Returns NULL if
   // no Decryptor object is associated. The returned object is only guaranteed
   // to be valid during the MediaKeys' lifetime.
   virtual Decryptor* GetDecryptor();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaKeys);
 };
 
 // Key event callbacks. See the spec for details:
 // https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#event-summary
 typedef base::Callback<void(const std::string& web_session_id,
                             const std::vector<uint8>& message,
                             const GURL& destination_url)> SessionMessageCB;
 
+typedef base::Callback<void(const std::string& web_session_id,

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

nit: For the methods, we have GetUsableKeyIds() at the end. We should probably
follow a similar pattern with events/CBs. WDYT?

This would apply to many of the earlier files

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

Done.

+                            bool has_additional_usable_key)>
+    SessionKeysChangeCB;
+
+typedef base::Callback<void(const std::string& web_session_id,
+                            double new_expiry_time)> SessionExpirationChangeCB;
+
 typedef base::Callback<void(const std::string& web_session_id)> SessionReadyCB;
 
 typedef base::Callback<void(const std::string& web_session_id)> SessionClosedCB;
 
 typedef base::Callback<void(const std::string& web_session_id,
                             MediaKeys::Exception exception_code,
                             uint32 system_code,
                             const std::string& error_message)> SessionErrorCB;
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MEDIA_KEYS_H_