Merge to M46 for BUG=510252

content/renderer/render_thread_impl.cc

Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 577f2bc5dc9f6b78ada6e4f2adff9c4cc8e0336c..ae718ab0607a2fbbd9a71dbe3e11c84d900a6708 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1356,7 +1356,11 @@ RenderThreadImpl::GetGpuFactories() {
     const bool enable_video_accelerator =
         !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
     const bool enable_gpu_memory_buffer_video_frames =
+#if defined(OS_MACOSX)
+        !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
+#else
         cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);
+#endif
     std::string image_texture_target_string =
         cmd_line->GetSwitchValueASCII(switches::kVideoImageTextureTarget);
     unsigned image_texture_target = 0;