Add PlayerTracker and BrowserCdm interfaces.

media/base/android/media_drm_bridge.h

Index: media/base/android/media_drm_bridge.h
diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h
index c122ac41f163b576ed5c374a5ec5b0ebce20c49e..e07b371832c501e230adc6b2f01a4125d4af0dd4 100644
--- a/media/base/android/media_drm_bridge.h
+++ b/media/base/android/media_drm_bridge.h
@@ -12,8 +12,9 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
+#include "media/base/browser_cdm.h"
 #include "media/base/media_export.h"
-#include "media/base/media_keys.h"
+#include "media/cdm/player_tracker_impl.h"
 #include "url/gurl.h"
 
 class GURL;
@@ -24,7 +25,7 @@ class MediaPlayerManager;
 
 // This class provides DRM services for android EME implementation.
 // TODO(qinmin): implement all the functions in this class.
-class MEDIA_EXPORT MediaDrmBridge : public MediaKeys {
+class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm {
  public:
   enum SecurityLevel {
     SECURITY_LEVEL_NONE = 0,
@@ -88,7 +89,7 @@ class MEDIA_EXPORT MediaDrmBridge : public MediaKeys {
   //   object. Calling this function multiples times may cause errors.
   bool SetSecurityLevel(SecurityLevel security_level);
 
-  // MediaKeys implementations.
+  // BrowserCdm implementations.
   virtual bool CreateSession(uint32 session_id,
                              const std::string& content_type,
                              const uint8* init_data,
@@ -99,6 +100,9 @@ class MEDIA_EXPORT MediaDrmBridge : public MediaKeys {
                              const uint8* response,
                              int response_length) OVERRIDE;
   virtual void ReleaseSession(uint32 session_id) OVERRIDE;
+  virtual int RegisterPlayer(const base::Closure& new_key_cb,
+                             const base::Closure& cdm_destroyed_cb) OVERRIDE;

[ddorwin, 2014/05/30 20:50:05]

UPDATE: Looking at the next file, this might need to handle the case when the
CDM disappears (i.e. the platform closes it). I still think "destroyed" is an
implementation detail of what the player should care about.

destroyed or disassociated?

It shouldn't be destroyed while associated should it? Or is this related to the
disconnection process where it may still be decrypting data until the threads
all stop. Even in that case, it seems like disconnection rather than destroyed,
which is really irrelevant (the player just needs to stop using it).

[xhwang, 2014/06/02 20:11:43]

This is really the reverse of SetCdm(). How about "unset"?
 
In normal cases, Blink should prevent the CDM from being destroyed while it's
still "set" on a player. But this is in the browser process and we should be
more error proof :)

+  virtual void UnregisterPlayer(int registration_id) OVERRIDE;
 
   // Returns a MediaCrypto object if it's already created. Returns a null object
   // otherwise.
@@ -163,6 +167,8 @@ class MEDIA_EXPORT MediaDrmBridge : public MediaKeys {
 
   ResetCredentialsCB reset_credentials_cb_;
 
+  PlayerTrackerImpl player_tracker_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge);
 };