Update MediaKeys interface for EME

content/renderer/media/crypto/proxy_media_keys.cc

Index: content/renderer/media/crypto/proxy_media_keys.cc
diff --git a/content/renderer/media/crypto/proxy_media_keys.cc b/content/renderer/media/crypto/proxy_media_keys.cc
index 17e918d80ec2338c847244448525903fa3d047a1..50223c707d29f74630a542df622bac91edfed53a 100644
--- a/content/renderer/media/crypto/proxy_media_keys.cc
+++ b/content/renderer/media/crypto/proxy_media_keys.cc
@@ -48,6 +48,14 @@ ProxyMediaKeys::~ProxyMediaKeys() {
   session_id_to_promise_map_.clear();
 }
 
+void ProxyMediaKeys::SetServerCertificate(
+    const uint8* certificate_data,
+    int certificate_data_length,
+    scoped_ptr<media::SimpleCdmPromise> promise) {
+  promise->reject(
+      INVALID_ACCESS_ERROR, 0, "SetServerCertificate() is not supported.");

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

There is a NOT_SUPPORTED_ERROR.
Note: Eventually, the Android implementation should accept and use this.

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

Done.

+}
+
 void ProxyMediaKeys::CreateSession(
     const std::string& init_data_type,
     const uint8* init_data,
@@ -107,7 +115,12 @@ void ProxyMediaKeys::UpdateSession(
       std::vector<uint8>(response, response + response_length));
 }
 
-void ProxyMediaKeys::ReleaseSession(
+void ProxyMediaKeys::CloseSession(const std::string& web_session_id,
+                                  scoped_ptr<media::SimpleCdmPromise> promise) {
+  promise->reject(INVALID_ACCESS_ERROR, 0, "CloseSession() is not supported.");

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

ditto on NOT_SUPPORTED_ERROR. The comment should be something like "Not yet
implemented."

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

See comment below.

+}
+
+void ProxyMediaKeys::RemoveSession(
     const std::string& web_session_id,
     scoped_ptr<media::SimpleCdmPromise> promise) {
   uint32 session_id = LookupSessionId(web_session_id);
@@ -120,6 +133,12 @@ void ProxyMediaKeys::ReleaseSession(
   manager_->ReleaseSession(cdm_id_, session_id);

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

Which function should actually be calling this? On Android, it seems more like
Close() - I don't think we have any uses of CKR on Android.

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

Since v0.1b CKR calls turn into RemoveSession() currently, I was doing it this
way to match existing code. Changed so both methods call ReleaseSession().
Unprefixed EME will let close() work, and remove() will fail (with session not
found), which makes sense since LoadSession() is not supported, so no persistent
data. Prefixed EME calls (which call RemoveSession()) will work as well.

[ddorwin, 2014/09/11 23:31:11]

See comment in new PS.

 }
 
+void ProxyMediaKeys::GetUsableKeyIds(const std::string& web_session_id,
+                                     scoped_ptr<media::KeyIdsPromise> promise) {
+  promise->reject(
+      INVALID_ACCESS_ERROR, 0, "GetUsableKeyIds() is not supported.");

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

ditto

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

Done.

+}
+
 void ProxyMediaKeys::OnSessionCreated(uint32 session_id,
                                       const std::string& web_session_id) {
   AssignWebSessionId(session_id, web_session_id);