Tie kWebRtcH264WithOpenH264FFmpeg and kEnableWebRtcHWH264Encoding flags on Mac

content/renderer/media/rtc_video_encoder_factory.cc

Index: content/renderer/media/rtc_video_encoder_factory.cc
diff --git a/content/renderer/media/rtc_video_encoder_factory.cc b/content/renderer/media/rtc_video_encoder_factory.cc
index d9fc4eef6dc349468a9b9ef228e6a8c8199b1b50..b6e927f11f8b9cb6943d7cb622319ebd16346410 100644
--- a/content/renderer/media/rtc_video_encoder_factory.cc
+++ b/content/renderer/media/rtc_video_encoder_factory.cc
@@ -5,8 +5,10 @@
 #include "content/renderer/media/rtc_video_encoder_factory.h"
 
 #include "base/command_line.h"
+#include "base/feature_list.h"
 #include "content/common/gpu/client/gpu_video_encode_accelerator_host.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/feature_h264_with_openh264_ffmpeg.h"
 #include "content/renderer/media/rtc_video_encoder.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 #include "media/video/video_encode_accelerator.h"
@@ -32,7 +34,13 @@ void VEAToWebRTCCodecs(
         webrtc::kVideoCodecVP8, "VP8", width, height, fps));
   } else if (profile.profile >= media::H264PROFILE_MIN &&
              profile.profile <= media::H264PROFILE_MAX) {
-    if (cmd_line->HasSwitch(switches::kEnableWebRtcHWH264Encoding)) {
+    bool webrtc_h264_enabled = false;
+#if BUILDFLAG(RTC_USE_H264) && defined(OS_MACOSX)
+    webrtc_h264_enabled =
+        base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg);

[mcasas, 2016/04/07 17:14:42]

No need for content::

[emircan, 2016/04/07 19:23:28]

Done.

+#endif  // BUILDFLAG(RTC_USE_H264) && defined(OS_MACOSX)
+    if (cmd_line->HasSwitch(switches::kEnableWebRtcHWH264Encoding) ||
+        webrtc_h264_enabled) {
       codecs->push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec(
           webrtc::kVideoCodecH264, "H264", width, height, fps));
     }