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

content/child/child_gpu_memory_buffer_manager.cc

 // Copyright 2014 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/child/child_gpu_memory_buffer_manager.h"
 
 #include <utility>
 
 #include "content/common/child_process_messages.h"
 #include "content/common/generic_shared_memory_id_generator.h"
-#include "content/common/gpu/client/gpu_memory_buffer_impl.h"
+#include "gpu/ipc/client/gpu_memory_buffer_impl.h"
 
 namespace content {
 namespace {
 
 void DeletedGpuMemoryBuffer(ThreadSafeSender* sender,
                             gfx::GpuMemoryBufferId id,
                             const gpu::SyncToken& sync_token) {
   TRACE_EVENT0("renderer",
                "ChildGpuMemoryBufferManager::DeletedGpuMemoryBuffer");
   sender->Send(new ChildProcessHostMsg_DeletedGpuMemoryBuffer(id, sync_token));
@@ skipping 21 matching lines @@
                size.height());
 
   gfx::GpuMemoryBufferHandle handle;
   IPC::Message* message = new ChildProcessHostMsg_SyncAllocateGpuMemoryBuffer(
       content::GetNextGenericSharedMemoryId(), size.width(), size.height(),
       format, usage, &handle);
   bool success = sender_->Send(message);
   if (!success || handle.is_null())
     return nullptr;
 
-  scoped_ptr<GpuMemoryBufferImpl> buffer(GpuMemoryBufferImpl::CreateFromHandle(
-      handle, size, format, usage,
-      base::Bind(&DeletedGpuMemoryBuffer, base::RetainedRef(sender_),
-                 handle.id)));
+  scoped_ptr<gpu::GpuMemoryBufferImpl> buffer(
+      gpu::GpuMemoryBufferImpl::CreateFromHandle(
+          handle, size, format, usage,
+          base::Bind(&DeletedGpuMemoryBuffer, base::RetainedRef(sender_),
+                     handle.id)));
   if (!buffer) {
     sender_->Send(new ChildProcessHostMsg_DeletedGpuMemoryBuffer(
         handle.id, gpu::SyncToken()));
     return nullptr;
   }
 
   return std::move(buffer);
 }
 
 scoped_ptr<gfx::GpuMemoryBuffer>
 ChildGpuMemoryBufferManager::CreateGpuMemoryBufferFromHandle(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
     gfx::BufferFormat format) {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 gfx::GpuMemoryBuffer*
 ChildGpuMemoryBufferManager::GpuMemoryBufferFromClientBuffer(
     ClientBuffer buffer) {
-  return GpuMemoryBufferImpl::FromClientBuffer(buffer);
+  return gpu::GpuMemoryBufferImpl::FromClientBuffer(buffer);
 }
 
 void ChildGpuMemoryBufferManager::SetDestructionSyncToken(
     gfx::GpuMemoryBuffer* buffer,
     const gpu::SyncToken& sync_token) {
-  static_cast<GpuMemoryBufferImpl*>(buffer)
-      ->set_destruction_sync_token(sync_token);
+  static_cast<gpu::GpuMemoryBufferImpl*>(buffer)->set_destruction_sync_token(
+      sync_token);
 }
 
 }  // namespace content