Renamed v4l2_video_device.*->v4l2_device.* and...

Renamed v4l2_video_device.*->v4l2_device.* and generic_v4l2_video_device.*->generic_v4l2_device.* and tegra_v4l2_video_device.*->tegra_v4l2_device.* to be consistent with class names.

BUG=453934

TEST=Built and deployed on peach_pi. AppRTC loopback and VEA test works fine.

Review URL: https://codereview.chromium.org/882123004

Cr-Commit-Position: refs/heads/master@{#318255}

content/common/BUILD.gn

@@ -329,20 +329,20 @@ source_set("common") {
       defines += [ "USE_V4L2_CODEC" ]
       sources += [
         "gpu/media/accelerated_video_decoder.h",
-        "gpu/media/generic_v4l2_video_device.cc",
-        "gpu/media/generic_v4l2_video_device.h",
+        "gpu/media/generic_v4l2_device.cc",
+        "gpu/media/generic_v4l2_device.h",
         "gpu/media/h264_decoder.cc",
         "gpu/media/h264_decoder.h",
         "gpu/media/h264_dpb.cc",
         "gpu/media/h264_dpb.h",
+        "gpu/media/v4l2_device.cc",
+        "gpu/media/v4l2_device.h",
         "gpu/media/v4l2_image_processor.cc",
         "gpu/media/v4l2_image_processor.h",
         "gpu/media/v4l2_slice_video_decode_accelerator.cc",
         "gpu/media/v4l2_slice_video_decode_accelerator.h",
         "gpu/media/v4l2_video_decode_accelerator.cc",
         "gpu/media/v4l2_video_decode_accelerator.h",
-        "gpu/media/v4l2_video_device.cc",
-        "gpu/media/v4l2_video_device.h",
         "gpu/media/v4l2_video_encode_accelerator.cc",
         "gpu/media/v4l2_video_encode_accelerator.h",
         "gpu/media/vp8_decoder.cc",
@@ -357,8 +357,8 @@ source_set("common") {
     }
     if (current_cpu == "arm") {
       sources += [
-        "gpu/media/tegra_v4l2_video_device.cc",
-        "gpu/media/tegra_v4l2_video_device.h",
+        "gpu/media/tegra_v4l2_device.cc",
+        "gpu/media/tegra_v4l2_device.h",
       ]
     }
     if (current_cpu != "arm") {

content/common/gpu/media/generic_v4l2_video_device.cc → content/common/gpu/media/generic_v4l2_device.cc

@@ -14,7 +14,7 @@
 #include "base/files/scoped_file.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/trace_event/trace_event.h"
-#include "content/common/gpu/media/generic_v4l2_video_device.h"
+#include "content/common/gpu/media/generic_v4l2_device.h"
 #include "ui/gl/egl_util.h"
 #include "ui/gl/gl_bindings.h"
 

content/common/gpu/media/generic_v4l2_video_device.h → content/common/gpu/media/generic_v4l2_device.h

@@ -5,10 +5,10 @@
 // This file contains the implementation of GenericV4L2Device used on
 // platforms, which provide generic V4L2 video codec devices.
 
-#ifndef CONTENT_COMMON_GPU_MEDIA_GENERIC_V4L2_VIDEO_DEVICE_H_
-#define CONTENT_COMMON_GPU_MEDIA_GENERIC_V4L2_VIDEO_DEVICE_H_
+#ifndef CONTENT_COMMON_GPU_MEDIA_GENERIC_V4L2_DEVICE_H_
+#define CONTENT_COMMON_GPU_MEDIA_GENERIC_V4L2_DEVICE_H_
 
-#include "content/common/gpu/media/v4l2_video_device.h"
+#include "content/common/gpu/media/v4l2_device.h"
 
 namespace content {
 
@@ -60,4 +60,4 @@ class GenericV4L2Device : public V4L2Device {
 };
 }  //  namespace content
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_GENERIC_V4L2_VIDEO_DEVICE_H_
+#endif  // CONTENT_COMMON_GPU_MEDIA_GENERIC_V4L2_DEVICE_H_

content/common/gpu/media/gpu_video_decode_accelerator.cc

@@ -32,9 +32,9 @@
 #include "content/common/gpu/media/vt_video_decode_accelerator.h"
 #elif defined(OS_CHROMEOS)
 #if defined(USE_V4L2_CODEC)
+#include "content/common/gpu/media/v4l2_device.h"
 #include "content/common/gpu/media/v4l2_slice_video_decode_accelerator.h"
 #include "content/common/gpu/media/v4l2_video_decode_accelerator.h"
-#include "content/common/gpu/media/v4l2_video_device.h"
 #endif
 #if defined(ARCH_CPU_X86_FAMILY)
 #include "content/common/gpu/media/vaapi_video_decode_accelerator.h"

content/common/gpu/media/tegra_v4l2_video_device.cc → content/common/gpu/media/tegra_v4l2_device.cc

@@ -9,7 +9,7 @@
 #include "base/lazy_instance.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/trace_event/trace_event.h"
-#include "content/common/gpu/media/tegra_v4l2_video_device.h"
+#include "content/common/gpu/media/tegra_v4l2_device.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace content {

content/common/gpu/media/tegra_v4l2_video_device.h → content/common/gpu/media/tegra_v4l2_device.h

@@ -5,10 +5,10 @@
 // This file contains the implementation of TegraV4L2Device used on
 // Tegra platform.
 
-#ifndef CONTENT_COMMON_GPU_MEDIA_TEGRA_V4L2_VIDEO_DEVICE_H_
-#define CONTENT_COMMON_GPU_MEDIA_TEGRA_V4L2_VIDEO_DEVICE_H_
+#ifndef CONTENT_COMMON_GPU_MEDIA_TEGRA_V4L2_DEVICE_H_
+#define CONTENT_COMMON_GPU_MEDIA_TEGRA_V4L2_DEVICE_H_
 
-#include "content/common/gpu/media/v4l2_video_device.h"
+#include "content/common/gpu/media/v4l2_device.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace content {
@@ -56,4 +56,4 @@ class TegraV4L2Device : public V4L2Device {
 
 }  //  namespace content
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_TEGRA_V4L2_VIDEO_DEVICE_H_
+#endif  // CONTENT_COMMON_GPU_MEDIA_TEGRA_V4L2_DEVICE_H_

content/common/gpu/media/v4l2_video_device.cc → content/common/gpu/media/v4l2_device.cc

@@ -6,9 +6,9 @@
 #include <linux/videodev2.h>
 
 #include "base/numerics/safe_conversions.h"
-#include "content/common/gpu/media/generic_v4l2_video_device.h"
+#include "content/common/gpu/media/generic_v4l2_device.h"
 #if defined(ARCH_CPU_ARMEL)
-#include "content/common/gpu/media/tegra_v4l2_video_device.h"
+#include "content/common/gpu/media/tegra_v4l2_device.h"
 #endif
 
 // TODO(posciak): remove this once V4L2 headers are updated.

content/common/gpu/media/v4l2_video_device.h → content/common/gpu/media/v4l2_device.h

@@ -6,8 +6,8 @@
 // V4L2DecodeAccelerator class to delegate/pass the device specific
 // handling of any of the functionalities.
 
-#ifndef CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_DEVICE_H_
-#define CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_DEVICE_H_
+#ifndef CONTENT_COMMON_GPU_MEDIA_V4L2_DEVICE_H_
+#define CONTENT_COMMON_GPU_MEDIA_V4L2_DEVICE_H_
 
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
@@ -108,4 +108,4 @@ class CONTENT_EXPORT V4L2Device
 
 }  //  namespace content
 
-#endif  //  CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_DEVICE_H_
+#endif  //  CONTENT_COMMON_GPU_MEDIA_V4L2_DEVICE_H_

content/common/gpu/media/v4l2_image_processor.h

@@ -13,7 +13,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
 #include "content/common/content_export.h"
-#include "content/common/gpu/media/v4l2_video_device.h"
+#include "content/common/gpu/media/v4l2_device.h"
 #include "media/base/video_frame.h"
 
 namespace content {

content/common/gpu/media/v4l2_slice_video_decode_accelerator.h

@@ -17,7 +17,7 @@
 #include "base/threading/thread.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/media/h264_decoder.h"
-#include "content/common/gpu/media/v4l2_video_device.h"
+#include "content/common/gpu/media/v4l2_device.h"
 #include "content/common/gpu/media/vp8_decoder.h"
 #include "media/video/video_decode_accelerator.h"
 

content/common/gpu/media/v4l2_video_decode_accelerator.h

@@ -19,7 +19,7 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "content/common/content_export.h"
-#include "content/common/gpu/media/v4l2_video_device.h"
+#include "content/common/gpu/media/v4l2_device.h"
 #include "media/base/limits.h"
 #include "media/base/video_decoder_config.h"
 #include "media/video/picture.h"

content/common/gpu/media/v4l2_video_encode_accelerator.h

@@ -13,8 +13,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
 #include "content/common/content_export.h"
+#include "content/common/gpu/media/v4l2_device.h"
 #include "content/common/gpu/media/v4l2_image_processor.h"
-#include "content/common/gpu/media/v4l2_video_device.h"
 #include "media/video/video_encode_accelerator.h"
 #include "ui/gfx/geometry/size.h"
 

content/content_common.gypi

@@ -824,20 +824,20 @@
       ],
       'sources': [
         'common/gpu/media/accelerated_video_decoder.h',
-        'common/gpu/media/generic_v4l2_video_device.cc',
-        'common/gpu/media/generic_v4l2_video_device.h',
+        'common/gpu/media/generic_v4l2_device.cc',
+        'common/gpu/media/generic_v4l2_device.h',
         'common/gpu/media/h264_decoder.cc',
         'common/gpu/media/h264_decoder.h',
         'common/gpu/media/h264_dpb.cc',
         'common/gpu/media/h264_dpb.h',
+        'common/gpu/media/v4l2_device.cc',
+        'common/gpu/media/v4l2_device.h',
         'common/gpu/media/v4l2_image_processor.cc',
         'common/gpu/media/v4l2_image_processor.h',
         'common/gpu/media/v4l2_slice_video_decode_accelerator.cc',
         'common/gpu/media/v4l2_slice_video_decode_accelerator.h',
         'common/gpu/media/v4l2_video_decode_accelerator.cc',
         'common/gpu/media/v4l2_video_decode_accelerator.h',
-        'common/gpu/media/v4l2_video_device.cc',
-        'common/gpu/media/v4l2_video_device.h',
         'common/gpu/media/v4l2_video_encode_accelerator.cc',
         'common/gpu/media/v4l2_video_encode_accelerator.h',
         'common/gpu/media/vp8_decoder.cc',
@@ -851,8 +851,8 @@
     }],
     ['target_arch == "arm" and chromeos == 1', {
       'sources': [
-        'common/gpu/media/tegra_v4l2_video_device.cc',
-        'common/gpu/media/tegra_v4l2_video_device.h',
+        'common/gpu/media/tegra_v4l2_device.cc',
+        'common/gpu/media/tegra_v4l2_device.h',
       ],
     }],
     ['target_arch != "arm" and chromeos == 1', {