Do not start RunLoop of MessagePumpForUI in NestedMessagePumpAndroid

content/browser/media/cdm/browser_cdm_manager.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/cdm/browser_cdm_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/task_runner.h"
@@ skipping 63 matching lines @@
   // This may overwrite an existing entry of |render_process_id| if the
   // previous process crashed and didn't cleanup its child frames. For example,
   // see FrameTreeBrowserTest.FrameTreeAfterCrash test.
   g_browser_cdm_manager_map.Get()[render_process_id] = this;
 }
 
 BrowserCdmManager::~BrowserCdmManager() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(g_browser_cdm_manager_map.Get().count(render_process_id_));
 
-  g_browser_cdm_manager_map.Get().erase(render_process_id_);
+  // If an entry of |render_process_id| was overwritten, we shouldn't remove
+  // the entry. For example, see FrameTreeBrowserTest.FrameTreeAfterCrash test,
+  // and http://crbug.com/430251.
+  if (g_browser_cdm_manager_map.Get()[render_process_id_] == this)
+    g_browser_cdm_manager_map.Get().erase(render_process_id_);
 }
 
 // Makes sure BrowserCdmManager is always deleted on the Browser UI thread.
 void BrowserCdmManager::OnDestruct() const {
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     delete this;
   } else {
     BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, this);
   }
 }
@@ skipping 290 matching lines @@
     DLOG(WARNING) << "No CDM found for: " << render_frame_id << ", " << cdm_id;
     SendSessionError(render_frame_id, cdm_id, session_id);
     return;
   }
 
   // This could fail, in which case a SessionError will be fired.
   cdm->CreateSession(session_id, content_type, &init_data[0], init_data.size());
 }
 
 }  // namespace content