Index: content/browser/media/media_web_contents_observer.cc |
diff --git a/content/browser/media/media_web_contents_observer.cc b/content/browser/media/media_web_contents_observer.cc |
index de1fb89adc4f6e24ec7840a00701453f7d4bf819..d23bd3299c5dbbd54d0863b848654e2bbe700e21 100644 |
--- a/content/browser/media/media_web_contents_observer.cc |
+++ b/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( |