Update MediaKeys interface for EME

content/renderer/media/crypto/proxy_decryptor.cc

Index: content/renderer/media/crypto/proxy_decryptor.cc
diff --git a/content/renderer/media/crypto/proxy_decryptor.cc b/content/renderer/media/crypto/proxy_decryptor.cc
index 8a9a757a9046c9150d95f7579429edfbd0e08d2f..377b7ee8af0527efdf128871973edfc75eed0ffc 100644
--- a/content/renderer/media/crypto/proxy_decryptor.cc
+++ b/content/renderer/media/crypto/proxy_decryptor.cc
@@ -218,7 +218,7 @@ void ProxyDecryptor::CancelKeyRequest(const std::string& web_session_id) {
                                   base::Bind(&ProxyDecryptor::OnSessionError,
                                              weak_ptr_factory_.GetWeakPtr(),
                                              web_session_id)));
-  media_keys_->ReleaseSession(web_session_id, promise.Pass());
+  media_keys_->RemoveSession(web_session_id, promise.Pass());

[ddorwin, 2014/09/24 17:37:46]

This may not be correct looking at the flow in ToT, which currently goes to
CloseSession in the CDM. We need to discuss.

[jrummell, 2014/09/24 22:32:32]

Prior to https://codereview.chromium.org/496143002 (2 weeks ago)
ReleaseSession() did call RemoveSession().
https://codereview.chromium.org/497153005 (4 weeks ago) description implies that
RemoveSession() is what should be called. No idea why no bugs for this in the
last 2 weeks.

[ddorwin, 2014/09/24 22:47:29]

Confirmed and filed bug 417481, which this CL fixes.

 }
 
 scoped_ptr<media::MediaKeys> ProxyDecryptor::CreateMediaKeys(
@@ -240,6 +240,10 @@ scoped_ptr<media::MediaKeys> ProxyDecryptor::CreateMediaKeys(
       base::Bind(&ProxyDecryptor::OnSessionClosed,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&ProxyDecryptor::OnSessionError,
+                 weak_ptr_factory_.GetWeakPtr()),
+      base::Bind(&ProxyDecryptor::OnSessionKeysChange,
+                 weak_ptr_factory_.GetWeakPtr()),
+      base::Bind(&ProxyDecryptor::OnSessionExpirationChange,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
@@ -261,6 +265,17 @@ void ProxyDecryptor::OnSessionMessage(const std::string& web_session_id,
   key_message_cb_.Run(web_session_id, message, destination_url);
 }
 
+void ProxyDecryptor::OnSessionKeysChange(const std::string& web_session_id,
+                                         bool has_additional_usable_key) {
+  // EME v0.1b doesn't support this event.
+}
+
+void ProxyDecryptor::OnSessionExpirationChange(
+    const std::string& web_session_id,
+    double new_expiry_time) {
+  // EME v0.1b doesn't support this event.
+}
+
 void ProxyDecryptor::OnSessionReady(const std::string& web_session_id) {
   key_added_cb_.Run(web_session_id);
 }