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

content/common/gpu/media/gpu_jpeg_decode_accelerator.h

Index: content/common/gpu/media/gpu_jpeg_decode_accelerator.h
diff --git a/content/common/gpu/media/gpu_jpeg_decode_accelerator.h b/content/common/gpu/media/gpu_jpeg_decode_accelerator.h
index 680dac578e09ef31d370647b28661cb3d09b4303..b6cf847c030365076f9eaa2d0a4dec45056bd4b0 100644
--- a/content/common/gpu/media/gpu_jpeg_decode_accelerator.h
+++ b/content/common/gpu/media/gpu_jpeg_decode_accelerator.h
@@ -20,11 +20,9 @@
 class SingleThreadTaskRunner;
 }
 
-namespace gpu {
+namespace content {
 class GpuChannel;
-}
 
-namespace content {
 class GpuJpegDecodeAccelerator
     : public IPC::Sender,
       public base::NonThreadSafe,
@@ -32,7 +30,7 @@
  public:
   // |channel| must outlive this object.
   GpuJpegDecodeAccelerator(
-      gpu::GpuChannel* channel,
+      GpuChannel* channel,
       const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner);
   ~GpuJpegDecodeAccelerator() override;
 
@@ -63,10 +61,10 @@
   static scoped_ptr<media::JpegDecodeAccelerator> CreateVaapiJDA(
       const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner);
 
-  // The lifetime of objects of this class is managed by a gpu::GpuChannel. The
+  // The lifetime of objects of this class is managed by a GpuChannel. The
   // GpuChannels destroy all the GpuJpegDecodeAccelerator that they own when
   // they are destroyed. So a raw pointer is safe.
-  gpu::GpuChannel* channel_;
+  GpuChannel* channel_;
 
   // The message filter to run JpegDecodeAccelerator::Decode on IO thread.
   scoped_refptr<MessageFilter> filter_;