Chromecast: updates BrowserCdmCast to handle new BrowserCdm API.

chromecast/media/cdm/browser_cdm_cast.h

Index: chromecast/media/cdm/browser_cdm_cast.h
diff --git a/chromecast/media/cdm/browser_cdm_cast.h b/chromecast/media/cdm/browser_cdm_cast.h
index 6a51ddc39806d6e1031379be9098409a3c1ec4ee..66c1794601f376685d9f1fa04921e4777d77d776 100644
--- a/chromecast/media/cdm/browser_cdm_cast.h
+++ b/chromecast/media/cdm/browser_cdm_cast.h
@@ -14,6 +14,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/browser_cdm.h"
+#include "media/cdm/json_web_key.h"
 #include "media/cdm/player_tracker_impl.h"
 
 namespace chromecast {
@@ -32,6 +33,13 @@ class BrowserCdmCast : public ::media::BrowserCdm {
   BrowserCdmCast();
   ~BrowserCdmCast() override;
 
+  void SetCallbacks(
+      const ::media::SessionMessageCB& session_message_cb,
+      const ::media::SessionClosedCB& session_closed_cb,
+      const ::media::SessionErrorCB& session_error_cb,
+      const ::media::SessionKeysChangeCB& session_keys_change_cb,
+      const ::media::SessionExpirationUpdateCB& session_expiration_update_cb);

[lcwu1, 2015/02/02 19:56:49]

Do you plan to hook up the new MediaKeys APIs in a separate CL?

[gunsch, 2015/02/02 20:00:25]

discussed offline, not necessary since:
a) we don't yet have any BrowserCdmCast implementations upstreamed
b) the "MediaKeys APIs" we declared downstream were as shims, but our internal
CDMs should work against the current TOT ::media::MediaKeys API.

+
   // PlayerTracker implementation.
   int RegisterPlayer(const base::Closure& new_key_cb,
                      const base::Closure& cdm_unset_cb) override;
@@ -44,10 +52,20 @@ class BrowserCdmCast : public ::media::BrowserCdm {
       const std::string& key_id) const = 0;
 
  protected:
-  // Notifies all listeners a new key was added.
-  void NotifyKeyAdded();
+  void OnSessionMessage(const std::string& web_session_id,
+                        const std::vector<uint8>& message,
+                        const GURL& destination_url);
+  void OnSessionClosed(const std::string& web_session_id);
+  void OnSessionKeysChange(const std::string& web_session_id,
+                           const ::media::KeyIdAndKeyPairs& keys);
 
  private:
+  ::media::SessionMessageCB session_message_cb_;
+  ::media::SessionClosedCB session_closed_cb_;
+  ::media::SessionErrorCB session_error_cb_;
+  ::media::SessionKeysChangeCB session_keys_change_cb_;
+  ::media::SessionExpirationUpdateCB session_expiration_update_cb_;
+
   ::media::PlayerTrackerImpl player_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserCdmCast);