Commit 46ca5510 authored by vrk@chromium.org's avatar vrk@chromium.org

Turn off AVFoundation field trial

Turning off AVFoundation by default on ToT, Canary, and in field trials
in preparation for M38 branch cut.

BUG=396810,394315,356106

Review URL: https://codereview.chromium.org/443783003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288054 0039d316-1c4b-4281-b951-d872f2087c98
parent a7549ddb
...@@ -274,19 +274,6 @@ MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher() ...@@ -274,19 +274,6 @@ MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher()
notifications_registrar_.Add( notifications_registrar_.Add(
this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED, this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
content::NotificationService::AllSources()); content::NotificationService::AllSources());
// AVFoundation is used for video/audio device monitoring and video capture in
// Mac. Experimentally, connect it in Canary and Unknown (developer builds).
#if defined(OS_MACOSX)
chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kForceQTKit)) {
if (channel == chrome::VersionInfo::CHANNEL_CANARY ||
channel == chrome::VersionInfo::CHANNEL_UNKNOWN) {
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableAVFoundation);
}
}
#endif
} }
MediaCaptureDevicesDispatcher::~MediaCaptureDevicesDispatcher() {} MediaCaptureDevicesDispatcher::~MediaCaptureDevicesDispatcher() {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment