Revert of Refactor content/common/gpu into gpu/ipc/service

content/common/gpu/media/media_channel.cc

Index: content/common/gpu/media/media_channel.cc
diff --git a/content/common/gpu/media/media_channel.cc b/content/common/gpu/media/media_channel.cc
index 7baeba075e4b46b02aa131f377456607aa8b2277..82a28bcfff610624b175ceeaa7fd394132cc761a 100644
--- a/content/common/gpu/media/media_channel.cc
+++ b/content/common/gpu/media/media_channel.cc
@@ -4,9 +4,9 @@
 
 #include "content/common/gpu/media/media_channel.h"
 
+#include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/media/gpu_video_decode_accelerator.h"
 #include "content/common/gpu/media/gpu_video_encode_accelerator.h"
-#include "gpu/ipc/service/gpu_channel.h"
 #include "media/gpu/ipc/common/media_messages.h"
 
 namespace content {
@@ -16,8 +16,8 @@
 void SendCreateJpegDecoderResult(
     scoped_ptr<IPC::Message> reply_message,
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
-    base::WeakPtr<gpu::GpuChannel> channel,
-    scoped_refptr<gpu::GpuChannelMessageFilter> filter,
+    base::WeakPtr<GpuChannel> channel,
+    scoped_refptr<GpuChannelMessageFilter> filter,
     bool result) {
   GpuChannelMsg_CreateJpegDecoder::WriteReplyParams(reply_message.get(),
                                                     result);
@@ -55,7 +55,7 @@
   DISALLOW_COPY_AND_ASSIGN(MediaChannelDispatchHelper);
 };
 
-MediaChannel::MediaChannel(gpu::GpuChannel* channel) : channel_(channel) {}
+MediaChannel::MediaChannel(GpuChannel* channel) : channel_(channel) {}
 
 MediaChannel::~MediaChannel() {}
 
@@ -99,7 +99,7 @@
     int32_t decoder_route_id,
     IPC::Message* reply_message) {
   TRACE_EVENT0("gpu", "MediaChannel::OnCreateVideoDecoder");
-  gpu::GpuCommandBufferStub* stub =
+  GpuCommandBufferStub* stub =
       channel_->LookupCommandBuffer(command_buffer_route_id);
   if (!stub) {
     reply_message->set_reply_error();
@@ -122,7 +122,7 @@
     const media::CreateVideoEncoderParams& params,
     IPC::Message* reply_message) {
   TRACE_EVENT0("gpu", "MediaChannel::OnCreateVideoEncoder");
-  gpu::GpuCommandBufferStub* stub =
+  GpuCommandBufferStub* stub =
       channel_->LookupCommandBuffer(command_buffer_route_id);
   if (!stub) {
     reply_message->set_reply_error();