Add PlayerTracker and BrowserCdm interfaces.

media/base/android/media_drm_bridge.h

 // Copyright (c) 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_ANDROID_MEDIA_DRM_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
 
 #include <jni.h>
 #include <string>
 #include <vector>
 
 #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;
 
 namespace media {
 
 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,
     SECURITY_LEVEL_1 = 1,
     SECURITY_LEVEL_3 = 3,
   };
 
   typedef base::Callback<void(bool)> ResetCredentialsCB;
 
   virtual ~MediaDrmBridge();
@@ skipping 43 matching lines @@
 
   // Returns true if |security_level| is successfully set, or false otherwise.
   // Call this function right after Create() and before any other calls.
   // Note:
   // - If this function is not called, the default security level of the device
   //   will be used.
   // - It's recommended to call this function only once on a MediaDrmBridge
   //   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,
                              int init_data_length) OVERRIDE;
   virtual void LoadSession(uint32 session_id,
                            const std::string& web_session_id) OVERRIDE;
   virtual void UpdateSession(uint32 session_id,
                              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.
   base::android::ScopedJavaLocalRef<jobject> GetMediaCrypto();
 
   // Sets callback which will be called when MediaCrypto is ready.
   // If |closure| is null, previously set callback will be cleared.
   void SetMediaCryptoReadyCB(const base::Closure& closure);
 
   // Called after a MediaCrypto object is created.
@@ skipping 44 matching lines @@
   SessionCreatedCB session_created_cb_;
   SessionMessageCB session_message_cb_;
   SessionReadyCB session_ready_cb_;
   SessionClosedCB session_closed_cb_;
   SessionErrorCB session_error_cb_;
 
   base::Closure media_crypto_ready_cb_;
 
   ResetCredentialsCB reset_credentials_cb_;
 
+  PlayerTrackerImpl player_tracker_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_