chrome/browser/media/media_capture_devices_dispatcher.h - Issue 14197014: Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

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: chrome/browser/media/media_capture_devices_dispatcher.h

Issue 14197014: Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge to head, address jyasskin's comments. Created 7 years, 7 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

« chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc ('K') | « chrome/browser/geolocation/geolocation_infobar_queue_controller_unittest.cc ('k') | chrome/browser/media/media_capture_devices_dispatcher.cc » ('j') | content/browser/browser_thread_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_capture_devices_dispatcher.h

diff --git a/chrome/browser/media/media_capture_devices_dispatcher.h b/chrome/browser/media/media_capture_devices_dispatcher.h

index c9fb31c77f05be7d0474058679858595b685ef18..0a704d437c871ef65cea8c7e842aba1cae787ec2 100644

--- a/chrome/browser/media/media_capture_devices_dispatcher.h

+++ b/chrome/browser/media/media_capture_devices_dispatcher.h

@@ -91,6 +91,11 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver {

bool video,

content::MediaStreamDevices* devices);

+ // Unittests that do not require actual device enumeration should call this

+ // API on the singleton. It is safe to call this multiple times on the

+ // signleton.

+ void DisableDeviceEnumerationForTesting();

// Overridden from content::MediaObserver:

virtual void OnAudioCaptureDevicesChanged(

const content::MediaStreamDevices& devices) OVERRIDE;

@@ -150,6 +155,9 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver {

// Only accessed on UI thread.

bool devices_enumerated_;

+ // Flag used by unittests to disable device enumeration.

+ bool is_device_enumeration_disabled_;

scoped_refptr<MediaStreamCaptureIndicator> media_stream_capture_indicator_;

scoped_refptr<AudioStreamIndicator> audio_stream_indicator_;