Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / media / video / capture / mac / avfoundation_glue.mm

diff --git a/src/media/video/capture/mac/avfoundation_glue.mm b/src/media/video/capture/mac/avfoundation_glue.mm
index 11fddd7..1ba764b 100644 (file)
--- a/src/media/video/capture/mac/avfoundation_glue.mm
+++ b/src/media/video/capture/mac/avfoundation_glue.mm
@@ -9,7 +9,6 @@
 #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 {
@@ -120,13 +119,9 @@ static base::LazyInstance<AVFoundationInternal> g_avfoundation_handle =
     LAZY_INSTANCE_INITIALIZER;
 
 bool AVFoundationGlue::IsAVFoundationSupported() {
-  if (!base::mac::IsOSLionOrLater())
-    return false;
-  const std::string group_name =
-      base::FieldTrialList::FindFullName("AVFoundationMacVideoCapture");
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
-  return (cmd_line->HasSwitch(switches::kEnableAVFoundation) ||
-      group_name == "Enabled") && [AVFoundationBundle() load];
+  return (!cmd_line->HasSwitch(switches::kDisableAVFoundation) &&
+      base::mac::IsOSLionOrLater() && [AVFoundationBundle() load]);
 }
 
 NSBundle const* AVFoundationGlue::AVFoundationBundle() {