Move content/common/gpu/client to gpu/ipc/client

content/common/gpu/media/gpu_video_encode_accelerator.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/media/gpu_video_encode_accelerator.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
 #include "base/numerics/safe_math.h"
 #include "base/sys_info.h"
 #include "build/build_config.h"
-#include "content/common/gpu/client/gpu_memory_buffer_impl.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/media/gpu_video_accelerator_util.h"
 #include "content/common/gpu/media/media_messages.h"
+#include "gpu/ipc/client/gpu_memory_buffer_impl.h"
 #include "ipc/ipc_message_macros.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/limits.h"
 #include "media/base/video_frame.h"
 
 #if defined(OS_CHROMEOS)
 #if defined(USE_V4L2_CODEC)
 #include "content/common/gpu/media/v4l2_video_encode_accelerator.h"
 #endif
 #if defined(ARCH_CPU_X86_FAMILY)
@@ skipping 313 matching lines @@
   uint8_t* data[media::VideoFrame::kMaxPlanes];
   int32_t strides[media::VideoFrame::kMaxPlanes];
   ScopedVector<gfx::GpuMemoryBuffer> buffers;
   const auto& handles = params.gpu_memory_buffer_handles;
   for (size_t i = 0; i < handles.size(); ++i) {
     const size_t width =
         media::VideoFrame::Columns(i, input_format_, params.size.width());
     const size_t height =
         media::VideoFrame::Rows(i, input_format_, params.size.height());
     scoped_ptr<gfx::GpuMemoryBuffer> buffer =
-        GpuMemoryBufferImpl::CreateFromHandle(
+        gpu::GpuMemoryBufferImpl::CreateFromHandle(
             handles[i], gfx::Size(width, height), gfx::BufferFormat::R_8,
             gfx::BufferUsage::GPU_READ_CPU_READ_WRITE,
             media::BindToCurrentLoop(base::Bind(&DestroyGpuMemoryBuffer)));
 
     // TODO(emircan): Refactor such that each frame is mapped once.
     // See http://crbug/536938.
     if (!buffer.get() || !buffer->Map()) {
       map_result = false;
       continue;
     }
@@ skipping 104 matching lines @@
   Send(new AcceleratedVideoEncoderHostMsg_NotifyInputDone(host_route_id_,
                                                           frame_id));
   // Just let |buffers| fall out of scope.
 }
 
 void GpuVideoEncodeAccelerator::Send(IPC::Message* message) {
   stub_->channel()->Send(message);
 }
 
 }  // namespace content