content/browser/renderer_host/media/media_capture_devices_impl.cc - Issue 216473002: Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in content/browser/renderer_hos…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 216473002: Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in content/browser/renderer_hos… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Sync to r260263 Created 6 years, 9 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/device_request_message_filter.cc ('k') | content/browser/renderer_host/media/media_stream_dispatcher_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/media_capture_devices_impl.cc

diff --git a/content/browser/renderer_host/media/media_capture_devices_impl.cc b/content/browser/renderer_host/media/media_capture_devices_impl.cc

index f4e13ab46709d50db10e3dedb486b54f4044b419..9cc8b12e470697b4c9939f2877881b17c6876173 100644

--- a/content/browser/renderer_host/media/media_capture_devices_impl.cc

+++ b/content/browser/renderer_host/media/media_capture_devices_impl.cc

@@ -13,7 +13,7 @@ namespace content {

namespace {

void EnsureMonitorCaptureDevices() {

- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

+ DCHECK_CURRENTLY_ON(BrowserThread::UI);

BrowserThread::PostTask(

BrowserThread::IO, FROM_HERE,

base::Bind(&MediaStreamManager::EnsureDeviceMonitorStarted,

@@ -33,7 +33,7 @@ MediaCaptureDevicesImpl* MediaCaptureDevicesImpl::GetInstance() {

const MediaStreamDevices&

MediaCaptureDevicesImpl::GetAudioCaptureDevices() {

- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

+ DCHECK_CURRENTLY_ON(BrowserThread::UI);

if (!devices_enumerated_) {

EnsureMonitorCaptureDevices();

devices_enumerated_ = true;

@@ -43,7 +43,7 @@ MediaCaptureDevicesImpl::GetAudioCaptureDevices() {

const MediaStreamDevices&

MediaCaptureDevicesImpl::GetVideoCaptureDevices() {

- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

+ DCHECK_CURRENTLY_ON(BrowserThread::UI);

if (!devices_enumerated_) {

EnsureMonitorCaptureDevices();

devices_enumerated_ = true;

@@ -84,14 +84,14 @@ MediaCaptureDevicesImpl::~MediaCaptureDevicesImpl() {

void MediaCaptureDevicesImpl::UpdateAudioDevicesOnUIThread(

const MediaStreamDevices& devices) {

- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

+ DCHECK_CURRENTLY_ON(BrowserThread::UI);

devices_enumerated_ = true;

audio_devices_ = devices;

}

void MediaCaptureDevicesImpl::UpdateVideoDevicesOnUIThread(

const MediaStreamDevices& devices) {

- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

+ DCHECK_CURRENTLY_ON(BrowserThread::UI);

devices_enumerated_ = true;

video_devices_ = devices;

}