media: split GpuMemoryBufferVideoFramePool into GpuMemoryBufferVideoFrameCopier/Pool

media/renderers/video_renderer_impl.cc

Index: media/renderers/video_renderer_impl.cc
diff --git a/media/renderers/video_renderer_impl.cc b/media/renderers/video_renderer_impl.cc
index ab7d0795d5769c65466fee5bfdfc3989f242152c..52b96eaaab36af3d07c341c0125b7c786e5a776a 100644
--- a/media/renderers/video_renderer_impl.cc
+++ b/media/renderers/video_renderer_impl.cc
@@ -22,7 +22,7 @@
 #include "media/base/pipeline_status.h"
 #include "media/base/video_frame.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
-#include "media/video/gpu_memory_buffer_video_frame_pool.h"
+#include "media/video/gpu_memory_buffer_video_frame_copier.h"
 
 namespace media {
 
@@ -40,7 +40,7 @@ VideoRendererImpl::VideoRendererImpl(
       video_frame_stream_(new VideoFrameStream(media_task_runner,
                                                std::move(decoders),
                                                media_log)),
-      gpu_memory_buffer_pool_(nullptr),
+      gpu_memory_buffer_copier_(nullptr),
       media_log_(media_log),
       low_delay_(false),
       received_end_of_stream_(false),
@@ -61,7 +61,7 @@ VideoRendererImpl::VideoRendererImpl(
       weak_factory_(this) {
   if (gpu_factories &&
       gpu_factories->ShouldUseGpuMemoryBuffersForVideoFrames()) {
-    gpu_memory_buffer_pool_.reset(new GpuMemoryBufferVideoFramePool(
+    gpu_memory_buffer_copier_.reset(new GpuMemoryBufferVideoFrameCopier(
         media_task_runner, worker_task_runner, gpu_factories));
   }
 }
@@ -282,8 +282,8 @@ void VideoRendererImpl::SetTickClockForTesting(
 }
 
 void VideoRendererImpl::SetGpuMemoryBufferVideoForTesting(
-    scoped_ptr<GpuMemoryBufferVideoFramePool> gpu_memory_buffer_pool) {
-  gpu_memory_buffer_pool_.swap(gpu_memory_buffer_pool);
+    scoped_ptr<GpuMemoryBufferVideoFrameCopier> gpu_memory_buffer_copier) {
+  gpu_memory_buffer_copier_.swap(gpu_memory_buffer_copier);
 }
 
 void VideoRendererImpl::OnTimeStateChanged(bool time_progressing) {
@@ -315,7 +315,7 @@ void VideoRendererImpl::FrameReadyForCopyingToGpuMemoryBuffers(
   }
 
   DCHECK(frame);
-  gpu_memory_buffer_pool_->MaybeCreateHardwareFrame(
+  gpu_memory_buffer_copier_->MaybeCreateHardwareFrame(
       frame, base::Bind(&VideoRendererImpl::FrameReady,
                         weak_factory_.GetWeakPtr(), sequence_token_, status));
 }
@@ -506,7 +506,7 @@ void VideoRendererImpl::AttemptRead_Locked() {
   switch (state_) {
     case kPlaying:
       pending_read_ = true;
-      if (gpu_memory_buffer_pool_) {
+      if (gpu_memory_buffer_copier_) {
         video_frame_stream_->Read(base::Bind(
             &VideoRendererImpl::FrameReadyForCopyingToGpuMemoryBuffers,
             weak_factory_.GetWeakPtr()));