Turn off AVFoundation field trial

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"
 #include "base/mac/mac_util.h"
-#include "base/metrics/field_trial.h"
 #include "media/base/media_switches.h"
 
 namespace {
 
 // This class is used to retrieve AVFoundation NSBundle and library handle. It
 // must be used as a LazyInstance so that it is initialised once and in a
 // thread-safe way. Normally no work is done in constructors: LazyInstance is
 // an exception.
 class AVFoundationInternal {
  public:
@@ skipping 95 matching lines @@
   // 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
   // TODO(vrk): Does this really need to be static?
   static bool should_enable_avfoundation =
-      command_line->HasSwitch(switches::kEnableAVFoundation) ||
-      base::FieldTrialList::FindFullName("AVFoundationMacVideoCapture")
-          == "Enabled";
+      command_line->HasSwitch(switches::kEnableAVFoundation);

[andresp-chromium, 2014/08/06 06:50:33]

Why remove the finch experiment here?

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

My thinking was that if we never wanted to turn on the finch experiment in M38
(which we wouldn't if we made M39 the min required version) then might as well
take it out of the binary entirely. But I'm fine to revert it - done.

   // Try to load AVFoundation. Save result in static bool to avoid loading
   // AVFoundationBundle every call.
   static bool loaded_successfully = [AVFoundationBundle() load];
   return should_enable_avfoundation && loaded_successfully;
 }
 
 NSBundle const* AVFoundationGlue::AVFoundationBundle() {
   return g_avfoundation_handle.Get().bundle();
 }
 
@@ skipping 74 matching lines @@
 @implementation AVCaptureDeviceInputGlue
 
 + (CrAVCaptureDeviceInput*)deviceInputWithDevice:(CrAVCaptureDevice*)device
                                            error:(NSError**)outError {
   return [[AVFoundationGlue::AVFoundationBundle()
       classNamed:@"AVCaptureDeviceInput"] deviceInputWithDevice:device
                                                           error:outError];
 }
 
 @end  // @implementation AVCaptureDeviceInputGlue