Fix BrowserMediaPlayerManager and BrowserCdmManager destruction order.

Fix BrowserMediaPlayerManager and BrowserCdmManager destruction order.

The order was reverted accidentally in r276200 which was wrong.

BUG=315312
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=276657

[xhwang, 2014-06-11 23:22:51]

PTAL

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

lgtm % nit

https://codereview.chromium.org/325363002/diff/1/media/base/android/media_sou...
File media/base/android/media_source_player.cc (right):

https://codereview.chromium.org/325363002/diff/1/media/base/android/media_sou...
media/base/android/media_source_player.cc:753: drm_bridge_ = NULL;
nit: also need to call
audio_decoder_job_->SetDrmBridge(NULL);
video_decoder_job_->SetDrmBridge(NULL);

[xhwang, 2014-06-11 23:42:23]

comments addressed

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

https://codereview.chromium.org/325363002/diff/1/media/base/android/media_sou...
File media/base/android/media_source_player.cc (right):

https://codereview.chromium.org/325363002/diff/1/media/base/android/media_sou...
media/base/android/media_source_player.cc:753: drm_bridge_ = NULL;
On 2014/06/11 23:36:25, qinmin wrote:
> nit: also need to call
> audio_decoder_job_->SetDrmBridge(NULL);
> video_decoder_job_->SetDrmBridge(NULL);

Done.

[xhwang, 2014-06-11 23:42:34]

The CQ bit was checked by xhwang@chromium.org

[commit-bot: I haz the power, 2014-06-11 23:44:36]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/xhwang@chromium.org/325363002/20001

[commit-bot: I haz the power, 2014-06-12 01:08:29]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  mac_chromium_compile_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_compile_...)
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)
  win_chromium_compile_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_compile_...)
  win_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_rel/buil...)
  win_chromium_x64_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_x64_rel/...)
  mac_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/15787)
  win_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/win_gpu/builds/18919)

[commit-bot: I haz the power, 2014-06-12 02:17:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-12 02:17:13]

Try jobs failed on following builders:
  win_chromium_compile_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_compile_...)

[qinmin, 2014-06-12 02:19:24]

The CQ bit was checked by qinmin@chromium.org

[commit-bot: I haz the power, 2014-06-12 02:21:36]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/xhwang@chromium.org/325363002/20001

[commit-bot: I haz the power, 2014-06-12 13:19:09]

Change committed as 276657