Mac Video Capture: Connect AVFoundation for Canary and Developer builds. Other channels unaffected.

chrome/browser/media/media_capture_devices_dispatcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 
 #include "apps/app_window.h"
 #include "apps/app_window_registry.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 258 matching lines @@
     : is_device_enumeration_disabled_(false),
       media_stream_capture_indicator_(new MediaStreamCaptureIndicator()) {
   // MediaCaptureDevicesDispatcher is a singleton. It should be created on
   // UI thread. Otherwise, it will not receive
   // content::NOTIFICATION_WEB_CONTENTS_DESTROYED, and that will result in
   // possible use after free.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   notifications_registrar_.Add(
       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 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() {}
 
 void MediaCaptureDevicesDispatcher::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterStringPref(
       prefs::kDefaultAudioCaptureDevice,
       std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
@@ skipping 713 matching lines @@
 
 void MediaCaptureDevicesDispatcher::SetTestAudioCaptureDevices(
     const MediaStreamDevices& devices) {
   test_audio_devices_ = devices;
 }
 
 void MediaCaptureDevicesDispatcher::SetTestVideoCaptureDevices(
     const MediaStreamDevices& devices) {
   test_video_devices_ = devices;
 }