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

content/common/gpu/media/media_channel.h

Index: content/common/gpu/media/media_channel.h
diff --git a/content/common/gpu/media/media_channel.h b/content/common/gpu/media/media_channel.h
index 7cfe0378587b2ce366985b8046affffd3b196066..c38b274467116fdedc9e0e7e1131acdc0d381b44 100644
--- a/content/common/gpu/media/media_channel.h
+++ b/content/common/gpu/media/media_channel.h
@@ -14,18 +14,15 @@
 struct CreateVideoEncoderParams;
 }
 
-namespace gpu {
+namespace content {
+
 class GpuChannel;
 class GpuCommandBufferStub;
-}
-
-namespace content {
-
 class MediaChannelDispatchHelper;
 
 class MediaChannel : public IPC::Listener, public IPC::Sender {
  public:
-  explicit MediaChannel(gpu::GpuChannel* channel);
+  explicit MediaChannel(GpuChannel* channel);
   ~MediaChannel() override;
 
   // IPC::Sender implementation:
@@ -47,7 +44,7 @@
                             const media::CreateVideoEncoderParams& params,
                             IPC::Message* reply_message);
 
-  gpu::GpuChannel* const channel_;
+  GpuChannel* const channel_;
   scoped_ptr<GpuJpegDecodeAccelerator> jpeg_decoder_;
   DISALLOW_COPY_AND_ASSIGN(MediaChannel);
 };