Fix BrowserMediaPlayerManager and BrowserCdmManager destruction order.

media/base/android/media_source_player.cc

 // 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.
 
 #include "media/base/android/media_source_player.h"
 
 #include <limits>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 726 matching lines @@
   if (!is_waiting_for_key_)
     return;
 
   is_waiting_for_key_ = false;
   if (playing_)
     StartInternal();
 }
 
 void MediaSourcePlayer::OnCdmUnset() {
   DVLOG(1) << __FUNCTION__;
+  // TODO(xhwang): Support detachment of CDM. This will be needed when we start
+  // 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_);
-  // 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.";
+  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