Move media-specific content/common/gpu files into content/common/gpu/media.

Give the new directory media-flavored OWNERS (in addition to the auto-inherited
OWNERS).
This should hopefully significantly cut down on OWNERS rubberstamps.

BUG=none
TEST=trybots & OVDATest passes on ARM.

Review URL: http://codereview.chromium.org/7192003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89390 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 36 insertions, 33 deletions

diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc
index 81563c5..dbb8e6a 100644
--- a/content/common/gpu/gpu_channel.cc
+++ b/content/common/gpu/gpu_channel.cc
@@ -17,7 +17,7 @@
 #include "content/common/content_switches.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_messages.h"
-#include "content/common/gpu/gpu_video_service.h"
+#include "content/common/gpu/media/gpu_video_service.h"
 #include "content/common/gpu/transport_texture.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_surface.h"
@@ -351,7 +351,7 @@ void GpuChannel::OnCreateTransportTexture(int32 context_route_id,
                             host_id, route_id));
    router_.AddRoute(route_id, transport.get());
    transport_textures_.AddWithID(transport.release(), route_id);
- 
+
    IPC::Message* msg = new GpuTransportTextureHostMsg_TransportTextureCreated(
        host_id, route_id);
    Send(msg);
diff --git a/content/common/gpu/media/OWNERS b/content/common/gpu/media/OWNERS
new file mode 100644
index 0000000..e33f4c8
--- /dev/null
+++ b/content/common/gpu/media/OWNERS
@@ -0,0 +1,3 @@
+fischman@chromium.org
+scherkus@chromium.org
+vrk@chromium.org
diff --git a/content/common/gpu/gles2_texture_to_egl_image_translator.cc b/content/common/gpu/media/gles2_texture_to_egl_image_translator.cc
index 210b6fa..a304956 100644
--- a/content/common/gpu/gles2_texture_to_egl_image_translator.cc
+++ b/content/common/gpu/media/gles2_texture_to_egl_image_translator.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/gpu/gles2_texture_to_egl_image_translator.h"
+#include "content/common/gpu/media/gles2_texture_to_egl_image_translator.h"
 
 #include "base/logging.h"
 
diff --git a/content/common/gpu/gles2_texture_to_egl_image_translator.h b/content/common/gpu/media/gles2_texture_to_egl_image_translator.h
index 728bbd8..c3015ab 100644
--- a/content/common/gpu/gles2_texture_to_egl_image_translator.h
+++ b/content/common/gpu/media/gles2_texture_to_egl_image_translator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_GPU_GLES2_TEXTURE_TO_EGL_IMAGE_TRANSLATOR_H_
-#define CONTENT_COMMON_GPU_GLES2_TEXTURE_TO_EGL_IMAGE_TRANSLATOR_H_
+#ifndef CONTENT_COMMON_GPU_MEDIA_GLES2_TEXTURE_TO_EGL_IMAGE_TRANSLATOR_H_
+#define CONTENT_COMMON_GPU_MEDIA_GLES2_TEXTURE_TO_EGL_IMAGE_TRANSLATOR_H_
 
 #include "base/basictypes.h"
 #include "media/video/picture.h"
@@ -36,4 +36,4 @@ class Gles2TextureToEglImageTranslator {
   DISALLOW_COPY_AND_ASSIGN(Gles2TextureToEglImageTranslator);
 };
 
-#endif  // CONTENT_COMMON_GPU_GLES2_TEXTURE_TO_EGL_IMAGE_TRANSLATOR_H_
+#endif  // CONTENT_COMMON_GPU_MEDIA_GLES2_TEXTURE_TO_EGL_IMAGE_TRANSLATOR_H_
diff --git a/content/common/gpu/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc
index e88d9a0..0c0bfc6 100644
--- a/content/common/gpu/gpu_video_decode_accelerator.cc
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/gpu/gpu_video_decode_accelerator.h"
+#include "content/common/gpu/media/gpu_video_decode_accelerator.h"
 
 #include <vector>
 
diff --git a/content/common/gpu/gpu_video_decode_accelerator.h b/content/common/gpu/media/gpu_video_decode_accelerator.h
index ffa855a..2eca25e 100644
--- a/content/common/gpu/gpu_video_decode_accelerator.h
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_GPU_GPU_VIDEO_DECODE_ACCELERATOR_H_
-#define CONTENT_COMMON_GPU_GPU_VIDEO_DECODE_ACCELERATOR_H_
+#ifndef CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_H_
+#define CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <vector>
 
@@ -77,4 +77,4 @@ class GpuVideoDecodeAccelerator
   DISALLOW_IMPLICIT_CONSTRUCTORS(GpuVideoDecodeAccelerator);
 };
 
-#endif  // CONTENT_COMMON_GPU_GPU_VIDEO_DECODE_ACCELERATOR_H_
+#endif  // CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_H_
diff --git a/content/common/gpu/gpu_video_service.cc b/content/common/gpu/media/gpu_video_service.cc
index 9b5c0e6..8c5fba0 100644
--- a/content/common/gpu/gpu_video_service.cc
+++ b/content/common/gpu/media/gpu_video_service.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/gpu/gpu_video_service.h"
+#include "content/common/gpu/media/gpu_video_service.h"
 
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_messages.h"
-#include "content/common/gpu/gpu_video_decode_accelerator.h"
+#include "content/common/gpu/media/gpu_video_decode_accelerator.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
-#include "content/common/gpu/omx_video_decode_accelerator.h"
+#include "content/common/gpu/media/omx_video_decode_accelerator.h"
 #include "ui/gfx/gl/gl_surface_egl.h"
 #endif  // defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
 
diff --git a/content/common/gpu/gpu_video_service.h b/content/common/gpu/media/gpu_video_service.h
index dbf4684..bf7aaa0 100644
--- a/content/common/gpu/gpu_video_service.h
+++ b/content/common/gpu/media/gpu_video_service.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_GPU_GPU_VIDEO_SERVICE_H_
-#define CONTENT_COMMON_GPU_GPU_VIDEO_SERVICE_H_
+#ifndef CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_SERVICE_H_
+#define CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_SERVICE_H_
 
 #include <map>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
-#include "content/common/gpu/gpu_video_decode_accelerator.h"
+#include "content/common/gpu/media/gpu_video_decode_accelerator.h"
 #include "ipc/ipc_channel.h"
 
 namespace gpu {
@@ -77,4 +77,4 @@ class GpuVideoService : public IPC::Channel::Listener {
   DISALLOW_COPY_AND_ASSIGN(GpuVideoService);
 };
 
-#endif  // CONTENT_COMMON_GPU_GPU_VIDEO_SERVICE_H_
+#endif  // CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_SERVICE_H_
diff --git a/content/common/gpu/omx_video_decode_accelerator.cc b/content/common/gpu/media/omx_video_decode_accelerator.cc
index 7c0a1cc..3ae43f7 100644
--- a/content/common/gpu/omx_video_decode_accelerator.cc
+++ b/content/common/gpu/media/omx_video_decode_accelerator.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/gpu/omx_video_decode_accelerator.h"
+#include "content/common/gpu/media/omx_video_decode_accelerator.h"
 
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
-#include "content/common/gpu/gles2_texture_to_egl_image_translator.h"
 #include "content/common/gpu/gpu_channel.h"
+#include "content/common/gpu/media/gles2_texture_to_egl_image_translator.h"
 #include "media/base/bitstream_buffer.h"
 #include "media/video/picture.h"
 
diff --git a/content/common/gpu/omx_video_decode_accelerator.h b/content/common/gpu/media/omx_video_decode_accelerator.h
index fcd7fcd..36d9f78 100644
--- a/content/common/gpu/omx_video_decode_accelerator.h
+++ b/content/common/gpu/media/omx_video_decode_accelerator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_GPU_OMX_VIDEO_DECODE_ACCELERATOR_H_
-#define CONTENT_COMMON_GPU_OMX_VIDEO_DECODE_ACCELERATOR_H_
+#ifndef CONTENT_COMMON_GPU_MEDIA_OMX_VIDEO_DECODE_ACCELERATOR_H_
+#define CONTENT_COMMON_GPU_MEDIA_OMX_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <dlfcn.h>
 #include <map>
@@ -174,4 +174,4 @@ class OmxVideoDecodeAccelerator : public media::VideoDecodeAccelerator {
                                           OMX_BUFFERHEADERTYPE* buffer);
 };
 
-#endif  // CONTENT_COMMON_GPU_OMX_VIDEO_DECODE_ACCELERATOR_H_
+#endif  // CONTENT_COMMON_GPU_MEDIA_OMX_VIDEO_DECODE_ACCELERATOR_H_
diff --git a/content/common/gpu/omx_video_decode_accelerator_unittest.cc b/content/common/gpu/media/omx_video_decode_accelerator_unittest.cc
index a737bdc..9b55913 100644
--- a/content/common/gpu/omx_video_decode_accelerator_unittest.cc
+++ b/content/common/gpu/media/omx_video_decode_accelerator_unittest.cc
@@ -31,7 +31,7 @@
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
-#include "content/common/gpu/omx_video_decode_accelerator.h"
+#include "content/common/gpu/media/omx_video_decode_accelerator.h"
 #include "third_party/angle/include/EGL/egl.h"
 #include "third_party/angle/include/GLES2/gl2.h"
 
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 5e2b104..24061c3 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -126,11 +126,11 @@
         'common/gpu/gpu_process_launch_causes.h',
         'common/gpu/gpu_surface_stub.cc',
         'common/gpu/gpu_surface_stub.h',
-        'common/gpu/gpu_video_decode_accelerator.cc',
-        'common/gpu/gpu_video_decode_accelerator.h',
-        'common/gpu/gpu_video_service.cc',
-        'common/gpu/gpu_video_service.h',
         'common/gpu/gpu_watchdog.h',
+        'common/gpu/media/gpu_video_decode_accelerator.cc',
+        'common/gpu/media/gpu_video_decode_accelerator.h',
+        'common/gpu/media/gpu_video_service.cc',
+        'common/gpu/media/gpu_video_service.h',
         'common/gpu/transport_texture.cc',
         'common/gpu/transport_texture.h',
         'common/hi_res_timer_manager_posix.cc',
@@ -289,10 +289,10 @@
             '../media/media.gyp:media',
           ],
           'sources': [
-            'common/gpu/gles2_texture_to_egl_image_translator.cc',
-            'common/gpu/gles2_texture_to_egl_image_translator.h',
-            'common/gpu/omx_video_decode_accelerator.cc',
-            'common/gpu/omx_video_decode_accelerator.h',
+            'common/gpu/media/gles2_texture_to_egl_image_translator.cc',
+            'common/gpu/media/gles2_texture_to_egl_image_translator.h',
+            'common/gpu/media/omx_video_decode_accelerator.cc',
+            'common/gpu/media/omx_video_decode_accelerator.h',
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/angle/include',
@@ -325,7 +325,7 @@
             '<(DEPTH)/third_party/openmax/il',
           ],
           'sources': [
-            'common/gpu/omx_video_decode_accelerator_unittest.cc',
+            'common/gpu/media/omx_video_decode_accelerator_unittest.cc',
           ],
         }
       ],
diff --git a/content/gpu/gpu_video_decode_accelerator_tester.cc b/content/gpu/gpu_video_decode_accelerator_tester.cc
index e95f73d..840f499 100644
--- a/content/gpu/gpu_video_decode_accelerator_tester.cc
+++ b/content/gpu/gpu_video_decode_accelerator_tester.cc
@@ -22,7 +22,7 @@
 #include "base/threading/thread.h"
 #include "content/common/common_param_traits.h"
 #include "content/common/gpu/gpu_messages.h"
-#include "content/gpu/gpu_video_decode_accelerator.h"
+#include "content/common/gpu/media/gpu_video_decode_accelerator.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_utils.h"