| Index: chrome/browser/media/media_capture_devices_dispatcher.cc
|
| diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc
|
| index 27f6b1ff510968304f6ac7b2b64d7d122296d5d4..47ba3dcae825ff4d475c4dffb98db300cd715799 100644
|
| --- a/chrome/browser/media/media_capture_devices_dispatcher.cc
|
| +++ b/chrome/browser/media/media_capture_devices_dispatcher.cc
|
| @@ -257,18 +257,11 @@ MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher()
|
| this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
|
| content::NotificationService::AllSources());
|
|
|
| - // AVFoundation is used for video/audio device monitoring and video capture in
|
| - // Mac. Experimentally, connect it in Dev, Canary and Unknown (developer
|
| - // builds).
|
| #if defined(OS_MACOSX)
|
| - chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
|
| + // AVFoundation is used for video/audio device monitoring and video capture.
|
| if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kForceQTKit)) {
|
| - if (channel == chrome::VersionInfo::CHANNEL_DEV ||
|
| - channel == chrome::VersionInfo::CHANNEL_CANARY ||
|
| - channel == chrome::VersionInfo::CHANNEL_UNKNOWN) {
|
| - CommandLine::ForCurrentProcess()->AppendSwitch(
|
| - switches::kEnableAVFoundation);
|
| - }
|
| + CommandLine::ForCurrentProcess()->AppendSwitch(
|
| + switches::kEnableAVFoundation);
|
| }
|
| #endif
|
| }
|
|
|