Fix BrowserMediaPlayerManager and BrowserCdmManager destruction order.

content/browser/media/media_web_contents_observer.cc

 // Copyright 2014 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 "content/browser/media/media_web_contents_observer.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "content/browser/media/cdm/browser_cdm_manager.h"
 #include "content/common/media/cdm_messages.h"
@@ skipping 13 matching lines @@
     RenderViewHost* render_view_host)
     : WebContentsObserver(WebContents::FromRenderViewHost(render_view_host)) {
 }
 
 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(
     const IPC::Message& msg,
     RenderFrameHost* render_frame_host) {
 #if defined(OS_ANDROID)
   // Handles MediaPlayer messages first because MediaPlayers messages are much
   // more frequent than CDM messages.
   if (OnMediaPlayerMessageReceived(msg, render_frame_host))
     return true;
@@ skipping 150 matching lines @@
       iter != media_player_managers_.end(); ++iter) {
     BrowserMediaPlayerManager* manager = iter->second;
     manager->OnFrameInfoUpdated();
   }
 }
 #endif  // defined(VIDEO_HOLE)
 
 #endif  // defined(OS_ANDROID)
 
 }  // namespace content