media: Make MediaKeys ref-counted.

media/base/android/media_codec_player.cc

Index: media/base/android/media_codec_player.cc
diff --git a/media/base/android/media_codec_player.cc b/media/base/android/media_codec_player.cc
index b444b1107d78438bc68fa33f2ff3da36ae37498b..8f55af56bc3986f843b11a2bc151e9c3a95bbcfd 100644
--- a/media/base/android/media_codec_player.cc
+++ b/media/base/android/media_codec_player.cc
@@ -99,7 +99,7 @@ MediaCodecPlayer::~MediaCodecPlayer()
 
   media_stat_->StopAndReport(GetInterpolatedTime());
 
-  if (drm_bridge_) {
+  if (cdm_) {
     DCHECK(cdm_registration_id_);
     drm_bridge_->UnregisterPlayer(cdm_registration_id_);

[Tima Vaisburd, 2015/10/28 22:49:40]

Can you use a cast from MediaKeys to MediaDemBridge? Then, I think, you can get
rid of |drm_bridge_| member variable.

   }
@@ -410,8 +410,9 @@ bool MediaCodecPlayer::IsPlayerReady() {
   return true;
 }
 
-void MediaCodecPlayer::SetCdm(BrowserCdm* cdm) {
+void MediaCodecPlayer::SetCdm(const scoped_refptr<MediaKeys>& cdm) {
   RUN_ON_MEDIA_THREAD(SetCdm, cdm);
+  DCHECK(cdm);
 
   DVLOG(1) << __FUNCTION__;
 
@@ -423,27 +424,27 @@ void MediaCodecPlayer::SetCdm(BrowserCdm* cdm) {
     return;
   }
 
-  if (drm_bridge_) {
+  if (cdm_) {
     NOTREACHED() << "Currently we do not support resetting CDM.";
     return;
   }
 
-  DCHECK(cdm);
-  drm_bridge_ = static_cast<MediaDrmBridge*>(cdm);
+  cdm_ = cdm;
 
-  DCHECK(drm_bridge_);
+  // Only MediaDrmBridge will be set on MediaCodecPlayer.
+  drm_bridge_ = static_cast<MediaDrmBridge*>(cdm_.get());

[Tima Vaisburd, 2015/10/28 22:49:40]

I think we can get rid of |drm_bridge_|. See below.

[xhwang, 2015/10/29 00:17:28]

Done.

 
-  cdm_registration_id_ = drm_bridge_->RegisterPlayer(
-      base::Bind(&MediaCodecPlayer::OnKeyAdded, media_weak_this_),
-      base::Bind(&MediaCodecPlayer::OnCdmUnset, media_weak_this_));
+  // Register CDM callbacks. The callbacks registered will be posted back to the
+  // media thread via BindToCurrentLoop.
 
-  MediaDrmBridge::MediaCryptoReadyCB cb = BindToCurrentLoop(
-      base::Bind(&MediaCodecPlayer::OnMediaCryptoReady, media_weak_this_));
+  cdm_registration_id_ = drm_bridge_->RegisterPlayer(
+      BindToCurrentLoop(
+          base::Bind(&MediaCodecPlayer::OnKeyAdded, media_weak_this_)),
+      BindToCurrentLoop(
+          base::Bind(&MediaCodecPlayer::OnCdmUnset, media_weak_this_)));
 
-  // Post back to MediaDrmBridge's default thread.
-  ui_task_runner_->PostTask(FROM_HERE,
-                            base::Bind(&MediaDrmBridge::SetMediaCryptoReadyCB,
-                                       drm_bridge_->WeakPtr(), cb));
+  drm_bridge_->SetMediaCryptoReadyCB(BindToCurrentLoop(
+      base::Bind(&MediaCodecPlayer::OnMediaCryptoReady, media_weak_this_)));
 }
 
 // Callbacks from Demuxer.
@@ -986,8 +987,9 @@ void MediaCodecPlayer::OnCdmUnset() {
   }
 
   cdm_registration_id_ = 0;
-  drm_bridge_ = nullptr;
   media_crypto_.reset();
+  drm_bridge_ = nullptr;
+  cdm_ = nullptr;
 }
 
 // State machine operations, called on Media thread