Fix BrowserMediaPlayerManager and BrowserCdmManager destruction order.

media/base/android/media_source_player.cc

Index: media/base/android/media_source_player.cc
diff --git a/media/base/android/media_source_player.cc b/media/base/android/media_source_player.cc
index 9b10b7850f86501619243712f01b1f66c56813e5..1398fb827c300c9dcfd31172f931d191537c942d 100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -744,11 +744,13 @@ void MediaSourcePlayer::OnKeyAdded() {
 
 void MediaSourcePlayer::OnCdmUnset() {
   DVLOG(1) << __FUNCTION__;
-  DCHECK(drm_bridge_);
   // TODO(xhwang): Support detachment of CDM. This will be needed when we start
-  // to support setMediaKeys(0), or when we release MediaDrm when the video is
-  // paused, or when the device goes to sleep. See http://crbug.com/272421
-  DVLOG(1) << "CDM detachment not supported.";
+  // to support setMediaKeys(0) (see http://crbug.com/330324), or when we
+  // release MediaDrm when the video is paused, or when the device goes to
+  // sleep (see http://crbug.com/272421).
+  NOTREACHED() << "CDM detachment not supported.";
+  DCHECK(drm_bridge_);
+  drm_bridge_ = NULL;

[qinmin, 2014/06/11 23:36:25]

nit: also need to call
audio_decoder_job_->SetDrmBridge(NULL);
video_decoder_job_->SetDrmBridge(NULL);

[xhwang, 2014/06/11 23:42:30]

Done.

 }
 
 }  // namespace media