media: split GpuMemoryBufferVideoFramePool into GpuMemoryBufferVideoFrameCopier/Pool

content/renderer/media/media_stream_video_renderer_sink.cc

Index: content/renderer/media/media_stream_video_renderer_sink.cc
diff --git a/content/renderer/media/media_stream_video_renderer_sink.cc b/content/renderer/media/media_stream_video_renderer_sink.cc
index 8e9eccd33f81245c689301d2434f9aad89f9fe27..96755995ce265d8c8438b824a1d7d75ab3599e5f 100644
--- a/content/renderer/media/media_stream_video_renderer_sink.cc
+++ b/content/renderer/media/media_stream_video_renderer_sink.cc
@@ -34,15 +34,15 @@ MediaStreamVideoRendererSink::MediaStreamVideoRendererSink(
       weak_factory_(this) {
   if (gpu_factories &&
       gpu_factories->ShouldUseGpuMemoryBuffersForVideoFrames()) {
-    gpu_memory_buffer_pool_.reset(new media::GpuMemoryBufferVideoFramePool(
+    gpu_memory_buffer_copier_.reset(new media::GpuMemoryBufferVideoFrameCopier(
         media_task_runner, worker_task_runner, gpu_factories));
   }
 }
 
 MediaStreamVideoRendererSink::~MediaStreamVideoRendererSink() {
-  if (gpu_memory_buffer_pool_) {
+  if (gpu_memory_buffer_copier_) {
     media_task_runner_->DeleteSoon(FROM_HERE,
-                                   gpu_memory_buffer_pool_.release());
+                                   gpu_memory_buffer_copier_.release());
   }
 }
 
@@ -87,8 +87,8 @@ void MediaStreamVideoRendererSink::Pause() {
 }
 
 void MediaStreamVideoRendererSink::SetGpuMemoryBufferVideoForTesting(
-    media::GpuMemoryBufferVideoFramePool* gpu_memory_buffer_pool) {
-  gpu_memory_buffer_pool_.reset(gpu_memory_buffer_pool);
+    media::GpuMemoryBufferVideoFrameCopier* gpu_memory_buffer_copier) {
+  gpu_memory_buffer_copier_.reset(gpu_memory_buffer_copier);
 }
 
 void MediaStreamVideoRendererSink::OnReadyStateChanged(
@@ -106,19 +106,19 @@ void MediaStreamVideoRendererSink::OnVideoFrame(
   if (state_ != STARTED)
     return;
 
-  if (!gpu_memory_buffer_pool_) {
+  if (!gpu_memory_buffer_copier_) {
     FrameReady(frame);
     return;
   }
 
-  //  |gpu_memory_buffer_pool_| deletion is going to be posted to
+  //  |gpu_memory_buffer_copier_| deletion is going to be posted to
   //  |media_task_runner_|. base::Unretained() usage is fine since
-  //  |gpu_memory_buffer_pool_| outlives the task.
+  //  |gpu_memory_buffer_copier_| outlives the task.
   media_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(
-          &media::GpuMemoryBufferVideoFramePool::MaybeCreateHardwareFrame,
-          base::Unretained(gpu_memory_buffer_pool_.get()), frame,
+          &media::GpuMemoryBufferVideoFrameCopier::MaybeCreateHardwareFrame,
+          base::Unretained(gpu_memory_buffer_copier_.get()), frame,
           media::BindToCurrentLoop(
               base::Bind(&MediaStreamVideoRendererSink::FrameReady,
                          weak_factory_.GetWeakPtr()))));