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

content/common/gpu/client/gpu_video_encode_accelerator_host.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/client/gpu_video_encode_accelerator_host.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/thread_task_runner_handle.h"
-#include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/media/gpu_video_accelerator_util.h"
 #include "content/common/gpu/media/media_messages.h"
+#include "gpu/ipc/client/gpu_channel_host.h"
 #include "media/base/video_frame.h"
 #include "media/video/video_encode_accelerator.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 
 namespace content {
 
 GpuVideoEncodeAcceleratorHost::GpuVideoEncodeAcceleratorHost(
-    GpuChannelHost* channel,
-    CommandBufferProxyImpl* impl)
+    gpu::GpuChannelHost* channel,
+    gpu::CommandBufferProxyImpl* impl)
     : channel_(channel),
       encoder_route_id_(MSG_ROUTING_NONE),
       client_(NULL),
       impl_(impl),
       next_frame_id_(0),
       weak_this_factory_(this) {
   DCHECK(channel_);
   DCHECK(impl_);
   impl_->AddDeletionObserver(this);
 }
@@ skipping 142 matching lines @@
   if (channel_)
     Send(new AcceleratedVideoEncoderMsg_Destroy(encoder_route_id_));
   client_ = NULL;
   delete this;
 }
 
 void GpuVideoEncodeAcceleratorHost::OnWillDeleteImpl() {
   DCHECK(CalledOnValidThread());
   impl_ = NULL;
 
-  // The CommandBufferProxyImpl is going away; error out this VEA.
+  // The gpu::CommandBufferProxyImpl is going away; error out this VEA.
   OnChannelError();
 }
 
 void GpuVideoEncodeAcceleratorHost::EncodeGpuMemoryBufferFrame(
     const scoped_refptr<media::VideoFrame>& frame,
     bool force_keyframe){
   DCHECK_EQ(media::VideoFrame::NumPlanes(media::PIXEL_FORMAT_I420),
             frame->gpu_memory_buffer_handles().size());
   AcceleratedVideoEncoderMsg_Encode_Params2 params;
   params.frame_id = next_frame_id_;
@@ skipping 125 matching lines @@
   weak_this_factory_.InvalidateWeakPtrs();
 
   // Client::NotifyError() may Destroy() |this|, so calling it needs to be the
   // last thing done on this stack!
   media::VideoEncodeAccelerator::Client* client = NULL;
   std::swap(client_, client);
   client->NotifyError(error);
 }
 
 }  // namespace content