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

content/common/gpu/media/media_service.h

Index: content/common/gpu/media/media_service.h
diff --git a/content/common/gpu/media/media_service.h b/content/common/gpu/media/media_service.h
index 15dca82260a1d0f0ba8dc743ab33c53f21370e7a..fb10904bdbf0c0a4242e2dc3dd0ff4802a234a12 100644
--- a/content/common/gpu/media/media_service.h
+++ b/content/common/gpu/media/media_service.h
@@ -13,18 +13,15 @@
 #include "ipc/ipc_sender.h"
 #include "media/video/video_decode_accelerator.h"
 
-namespace gpu {
+namespace content {
+
 class GpuChannel;
 class GpuChannelManager;
-}
-
-namespace content {
-
 class MediaChannel;
 
 class MediaService {
  public:
-  MediaService(gpu::GpuChannelManager* channel_manager);
+  MediaService(GpuChannelManager* channel_manager);
   ~MediaService();
 
   void AddChannel(int32_t client_id);
@@ -32,7 +29,7 @@
   void DestroyAllChannels();
 
  private:
-  gpu::GpuChannelManager* const channel_manager_;
+  GpuChannelManager* const channel_manager_;
   base::ScopedPtrHashMap<int32_t, scoped_ptr<MediaChannel>> media_channels_;
   DISALLOW_COPY_AND_ASSIGN(MediaService);
 };