Fix force-qtkit flag on dev channel

media/video/capture/mac/avfoundation_glue.mm

 // Copyright 2013 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.
 
 #import "media/video/capture/mac/avfoundation_glue.h"
 
 #include <dlfcn.h>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 92 matching lines @@
 }  // namespace
 
 static base::LazyInstance<AVFoundationInternal> g_avfoundation_handle =
     LAZY_INSTANCE_INITIALIZER;
 
 bool AVFoundationGlue::IsAVFoundationSupported() {
   // DeviceMonitorMac will initialize this static bool from the main UI thread
   // once, during Chrome startup so this construction is thread safe.
   // Use AVFoundation if possible, enabled, and QTKit is not explicitly forced.
   static CommandLine* command_line = CommandLine::ForCurrentProcess();
-  static bool is_av_foundation_supported = base::mac::IsOSLionOrLater() &&
-      ((command_line->HasSwitch(switches::kEnableAVFoundation) &&
-      !command_line->HasSwitch(switches::kForceQTKit)) ||
-      base::FieldTrialList::FindFullName("AVFoundationMacVideoCapture")
-          == "Enabled") && [AVFoundationBundle() load];
-  return is_av_foundation_supported;
+
+  // AVFoundation is only available on OS Lion and above.
+  if (!base::mac::IsOSLionOrLater())

[DaleCurtis, 2014/07/23 20:54:38]

I think you want to merge these into the static initialization below for
consistency; though I have no idea if it's really necessary for any of this to
be static. I suppose it's just trying to avoid multiple loads.

[vrk (LEFT CHROMIUM), 2014/07/25 00:01:15]

Ah, thanks for the catch! Didn't pay attention to the statics.

Looking into this, the result of IsOSLionOrLater() is OK to be non-static since
its implementation already caches the result before it returns it. Not entirely
sure if [AVFoundationBundle() load] needs to be static but I pulled it out into
a separate variable static bool to keep the behavior same as before. Will ask
mcasas/tommi when they're back to see if it's OK to drop the static.

+    return false;
+
+  // The force-qtkit flag takes precedence over enable-avfoundation.
+  if (command_line->HasSwitch(switches::kForceQTKit))
+    return false;
+
+  // Next in precedence is the Enable AVFoundation flag.
+  // TODO(mcasas,vrk): There should be 3 states of AVFoundation: user forced on,
+  // user forced off (i.e. force QTKit), and default (respect field trial).
+  // crbug.com/396764
+  static bool avfoundation_requested =
+      command_line->HasSwitch(switches::kEnableAVFoundation) ||
+      (base::FieldTrialList::FindFullName("AVFoundationMacVideoCapture")
+          == "Enabled");
+  return avfoundation_requested && [AVFoundationBundle() load];
 }
 
 NSBundle const* AVFoundationGlue::AVFoundationBundle() {
   return g_avfoundation_handle.Get().bundle();
 }
 
 void* AVFoundationGlue::AVFoundationLibraryHandle() {
   return g_avfoundation_handle.Get().library_handle();
 }
 
@@ skipping 70 matching lines @@
 @implementation AVCaptureDeviceInputGlue
 
 + (CrAVCaptureDeviceInput*)deviceInputWithDevice:(CrAVCaptureDevice*)device
                                            error:(NSError**)outError {
   return [[AVFoundationGlue::AVFoundationBundle()
       classNamed:@"AVCaptureDeviceInput"] deviceInputWithDevice:device
                                                           error:outError];
 }
 
 @end  // @implementation AVCaptureDeviceInputGlue