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

Side by Side 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, 11 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/media/media_stream_manager.h" 5 #include "content/browser/renderer_host/media/media_stream_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 } 450 }
451 451
452 AudioInputDeviceManager* MediaStreamManager::audio_input_device_manager() { 452 AudioInputDeviceManager* MediaStreamManager::audio_input_device_manager() {
453 DCHECK_CURRENTLY_ON(BrowserThread::IO); 453 DCHECK_CURRENTLY_ON(BrowserThread::IO);
454 DCHECK(audio_input_device_manager_.get()); 454 DCHECK(audio_input_device_manager_.get());
455 return audio_input_device_manager_.get(); 455 return audio_input_device_manager_.get();
456 } 456 }
457 457
458 MediaDevicesManager* MediaStreamManager::media_devices_manager() { 458 MediaDevicesManager* MediaStreamManager::media_devices_manager() {
459 DCHECK_CURRENTLY_ON(BrowserThread::IO); 459 DCHECK_CURRENTLY_ON(BrowserThread::IO);
460 DCHECK(media_devices_manager_.get()); 460 // nullptr might be returned during shutdown.
461 return media_devices_manager_.get(); 461 return media_devices_manager_.get();
462 } 462 }
463 463
464 std::string MediaStreamManager::MakeMediaAccessRequest( 464 std::string MediaStreamManager::MakeMediaAccessRequest(
465 int render_process_id, 465 int render_process_id,
466 int render_frame_id, 466 int render_frame_id,
467 int page_request_id, 467 int page_request_id,
468 const StreamControls& controls, 468 const StreamControls& controls,
469 const url::Origin& security_origin, 469 const url::Origin& security_origin,
470 const MediaRequestResponseCallback& callback) { 470 const MediaRequestResponseCallback& callback) {
(...skipping 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after
1743 generate_stream_test_callback_ = test_callback; 1743 generate_stream_test_callback_ = test_callback;
1744 } 1744 }
1745 1745
1746 #if defined(OS_WIN) 1746 #if defined(OS_WIN)
1747 void MediaStreamManager::FlushVideoCaptureThreadForTesting() { 1747 void MediaStreamManager::FlushVideoCaptureThreadForTesting() {
1748 video_capture_thread_.FlushForTesting(); 1748 video_capture_thread_.FlushForTesting();
1749 } 1749 }
1750 #endif 1750 #endif
1751 1751
1752 } // namespace content 1752 } // namespace content
OLDNEW
« 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