diff options
| author | davidben <davidben@chromium.org> | 2015-07-10 10:21:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-10 17:22:38 +0000 |
| commit | 7f59ee147777a9df9e5a83462c6a230ad060e81e (patch) | |
| tree | 72ad6300fd55334eb9513e993d730e27af93d5ed | |
| parent | ef0b43b102ce6999c847e46d5663ad2d5c826507 (diff) | |
| download | chromium_src-7f59ee147777a9df9e5a83462c6a230ad060e81e.zip chromium_src-7f59ee147777a9df9e5a83462c6a230ad060e81e.tar.gz chromium_src-7f59ee147777a9df9e5a83462c6a230ad060e81e.tar.bz2 | |
Remove incorrect DCHECK in ~BrowserCdmManager.
https://codereview.chromium.org/1225083002 fixed the core issue but left an
incorrect DCHECK in the code. It is not the case that only a single
BrowserCdmManager per RPH ID may be alive at a time, only that a single one
corresponds to a given live process. (A reference-counted type can never be
assumed to have bounded lifetime for the same reason garbage-collected types
can never be assumed to have bounded lifetime.)
This fixes ChildProcessLauncherBrowserTest.ChildSpawnFail's flakiness on
cast_shell_linux when use_openssl is switched.
BUG=506188,462040
Review URL: https://codereview.chromium.org/1235653002
Cr-Commit-Position: refs/heads/master@{#338312}
| -rw-r--r-- | content/browser/media/cdm/browser_cdm_manager.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc index 6702e31..e7d786c 100644 --- a/content/browser/media/cdm/browser_cdm_manager.cc +++ b/content/browser/media/cdm/browser_cdm_manager.cc @@ -177,7 +177,6 @@ BrowserCdmManager::BrowserCdmManager( BrowserCdmManager::~BrowserCdmManager() { DVLOG(1) << __FUNCTION__ << ": " << render_process_id_; DCHECK_CURRENTLY_ON(BrowserThread::UI); - DCHECK(g_browser_cdm_manager_map.Get().count(render_process_id_) == 0); } // Makes sure BrowserCdmManager is always deleted on the Browser UI thread. |