Fix BrowserMediaPlayerManager and BrowserCdmManager destruction order.

The order was reverted accidentally in r276200 which was wrong.

BUG=315312

Review URL: https://codereview.chromium.org/325363002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276657 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/media/media_web_contents_observer.cc

@@ -31,10 +31,12 @@ MediaWebContentsObserver::~MediaWebContentsObserver() {
 void MediaWebContentsObserver::RenderFrameDeleted(
     RenderFrameHost* render_frame_host) {
   uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
-  cdm_managers_.erase(key);
+  // Always destroy the media players before CDMs because we do not support
+  // detaching CDMs from media players yet. See http://crbug.com/330324
 #if defined(OS_ANDROID)
   media_player_managers_.erase(key);
 #endif
+  cdm_managers_.erase(key);
 }
 
 bool MediaWebContentsObserver::OnMessageReceived(

media/base/android/media_source_player.cc

@@ -744,11 +744,15 @@ 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_);
+  audio_decoder_job_->SetDrmBridge(NULL);
+  video_decoder_job_->SetDrmBridge(NULL);
+  drm_bridge_ = NULL;
 }
 
 }  // namespace media