VideoCapture: add support for GpuMemoryBuffer allocation and lifetime mgmt in VideoCaptureBufferPool

content/browser/renderer_host/media/video_capture_controller.cc

Index: content/browser/renderer_host/media/video_capture_controller.cc
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
index a2c4b1936f63401e9e873089d56505a682ffefd2..06bfc8de94b42fb2f4ef5d6ce41b52945c876b16 100644
--- a/content/browser/renderer_host/media/video_capture_controller.cc
+++ b/content/browser/renderer_host/media/video_capture_controller.cc
@@ -26,10 +26,6 @@
 #include "content/browser/compositor/image_transport_factory.h"
 #endif
 
-#if defined(ENABLE_WEBRTC) && (defined(OS_LINUX) || defined(OS_MACOSX))
-#include "content/browser/renderer_host/media/video_capture_texture_wrapper.h"
-#endif
-
 using media::VideoCaptureFormat;
 using media::VideoFrame;
 
@@ -144,18 +140,9 @@ VideoCaptureController::NewDeviceClient(
     const scoped_refptr<base::SingleThreadTaskRunner>& capture_task_runner,
     const media::VideoCaptureFormat& format) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-#if defined(ENABLE_WEBRTC) && (defined(OS_LINUX) || defined(OS_MACOSX))
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableWebRtcCaptureToTexture)) {
-    return make_scoped_ptr(new VideoCaptureTextureWrapper(
-        this->GetWeakPtrForIOThread(), buffer_pool_, capture_task_runner,
-        format));
-    DVLOG(1) << "TextureWrapper, format " << format.ToString();
-  }
-#endif
   return make_scoped_ptr(
-      new VideoCaptureDeviceClient(this->GetWeakPtrForIOThread(),
-                                   buffer_pool_));
+      new VideoCaptureDeviceClient(this->GetWeakPtrForIOThread(), buffer_pool_,
+                                   capture_task_runner, format));
 }
 
 void VideoCaptureController::AddClient(