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_; |