Reland: H264 HW encode using VideoToolbox

content/common/gpu/media/gpu_video_encode_accelerator.cc

Index: content/common/gpu/media/gpu_video_encode_accelerator.cc
diff --git a/content/common/gpu/media/gpu_video_encode_accelerator.cc b/content/common/gpu/media/gpu_video_encode_accelerator.cc
index 21b1bc557d860870177fc5377a1aae6c510b859b..46f96fb19868bc0b44e6b86c7595184a1fa30e16 100644
--- a/content/common/gpu/media/gpu_video_encode_accelerator.cc
+++ b/content/common/gpu/media/gpu_video_encode_accelerator.cc
@@ -31,6 +31,8 @@
 #endif
 #elif defined(OS_ANDROID) && defined(ENABLE_WEBRTC)
 #include "content/common/gpu/media/android_video_encode_accelerator.h"
+#elif defined(OS_MACOSX)
+#include "content/common/gpu/media/vt_video_encode_accelerator_mac.h"
 #endif
 
 namespace content {
@@ -211,6 +213,9 @@ GpuVideoEncodeAccelerator::CreateVEAFps(
   if (!gpu_preferences.disable_web_rtc_hw_encoding)
     create_vea_fps.push_back(&GpuVideoEncodeAccelerator::CreateAndroidVEA);
 #endif
+#if defined(OS_MACOSX)
+  create_vea_fps.push_back(&GpuVideoEncodeAccelerator::CreateVTVEA);
+#endif
   return create_vea_fps;
 }
 
@@ -244,6 +249,15 @@ GpuVideoEncodeAccelerator::CreateAndroidVEA() {
 }
 #endif
 
+#if defined(OS_MACOSX)
+// static
+scoped_ptr<media::VideoEncodeAccelerator>
+GpuVideoEncodeAccelerator::CreateVTVEA() {
+  return make_scoped_ptr<media::VideoEncodeAccelerator>(
+      new VTVideoEncodeAccelerator());
+}
+#endif
+
 void GpuVideoEncodeAccelerator::OnEncode(
     const AcceleratedVideoEncoderMsg_Encode_Params& params) {
   DVLOG(3) << "GpuVideoEncodeAccelerator::OnEncode: frame_id = "