Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1392)

Unified Diff: content/browser/renderer_host/media/media_stream_manager.cc

Issue 2606323002: Add null check for MediaDevicesManager in MDDH destructor. (Closed)
Patch Set: Add comment Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/media/media_devices_dispatcher_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/media_stream_manager.cc
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index 0da58a4dc1a807af796a83d476c08bf21425803a..029b0638c4e3ced5da47532ccb1c32e5b6504b51 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -457,7 +457,7 @@ AudioInputDeviceManager* MediaStreamManager::audio_input_device_manager() {
MediaDevicesManager* MediaStreamManager::media_devices_manager() {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
- DCHECK(media_devices_manager_.get());
+ // nullptr might be returned during shutdown.
return media_devices_manager_.get();
}
« no previous file with comments | « content/browser/renderer_host/media/media_devices_dispatcher_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698