media/gpu: move test related files to media/gpu/test data directory

BUG=chromium:834170
TEST=VDA/VEA/JDA/JEA unittest built scueessfully for Chrome OS on both x86 and
ARM platforms
TEST=made sure for other platforms by CQ

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I480220047ac23e4c26ee4dfff0ac2ef3bac70f6b
Reviewed-on: https://chromium-review.googlesource.com/1016222Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Commit-Queue: Hirokazu Honda <hiroh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553924}

media/gpu/BUILD.gn

@@ -353,7 +353,7 @@ source_set("common") {
 if (is_win || is_android || use_v4l2_codec || use_vaapi) {
   test("video_decode_accelerator_unittest") {
     sources = [
-      "video_accelerator_unittest_helpers.h",
+      "test/video_accelerator_unittest_helpers.h",
     ]
 
     data = [
@@ -381,8 +381,8 @@ if (is_win || is_android || use_v4l2_codec || use_vaapi) {
 
     if (is_win || is_chromeos || use_v4l2_codec) {
       sources += [
-        "rendering_helper.cc",
-        "rendering_helper.h",
+        "test/rendering_helper.cc",
+        "test/rendering_helper.h",
         "video_decode_accelerator_unittest.cc",
       ]
       deps += [
@@ -483,7 +483,7 @@ if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
     ]
     configs += [ "//third_party/libyuv:libyuv_config" ]
     sources = [
-      "video_accelerator_unittest_helpers.h",
+      "test/video_accelerator_unittest_helpers.h",
       "video_encode_accelerator_unittest.cc",
     ]
     if (use_x11) {
@@ -515,7 +515,7 @@ if (use_vaapi) {
     configs += [ "//third_party/libyuv:libyuv_config" ]
     sources = [
       "jpeg_encode_accelerator_unittest.cc",
-      "video_accelerator_unittest_helpers.h",
+      "test/video_accelerator_unittest_helpers.h",
     ]
     if (use_x11) {
       deps += [ "//ui/gfx/x" ]
@@ -545,7 +545,7 @@ if (use_v4l2_codec || use_vaapi) {
     configs += [ "//third_party/libyuv:libyuv_config" ]
     sources = [
       "jpeg_decode_accelerator_unittest.cc",
-      "video_accelerator_unittest_helpers.h",
+      "test/video_accelerator_unittest_helpers.h",
     ]
     if (use_x11) {
       deps += [ "//ui/gfx/x" ]

media/gpu/jpeg_decode_accelerator_unittest.cc

@@ -28,7 +28,7 @@
 #include "media/filters/jpeg_parser.h"
 #include "media/gpu/buildflags.h"
 #include "media/gpu/gpu_jpeg_decode_accelerator_factory.h"
-#include "media/gpu/video_accelerator_unittest_helpers.h"
+#include "media/gpu/test/video_accelerator_unittest_helpers.h"
 #include "media/video/jpeg_decode_accelerator.h"
 #include "third_party/libyuv/include/libyuv.h"
 #include "ui/gfx/codec/jpeg_codec.h"

media/gpu/jpeg_encode_accelerator_unittest.cc

@@ -30,8 +30,8 @@
 #include "media/base/test_data_util.h"
 #include "media/filters/jpeg_parser.h"
 #include "media/gpu/buildflags.h"
+#include "media/gpu/test/video_accelerator_unittest_helpers.h"
 #include "media/gpu/vaapi/vaapi_jpeg_encode_accelerator.h"
-#include "media/gpu/video_accelerator_unittest_helpers.h"
 #include "media/video/jpeg_encode_accelerator.h"
 #include "third_party/libyuv/include/libyuv.h"
 #include "ui/gfx/codec/jpeg_codec.h"

media/gpu/rendering_helper.cc → media/gpu/test/rendering_helper.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 "media/gpu/rendering_helper.h"
+#include "media/gpu/test/rendering_helper.h"
 
 #include <string.h>
 

media/gpu/rendering_helper.h → media/gpu/test/rendering_helper.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 MEDIA_GPU_RENDERING_HELPER_H_
-#define MEDIA_GPU_RENDERING_HELPER_H_
+#ifndef MEDIA_GPU_TEST_RENDERING_HELPER_H_
+#define MEDIA_GPU_TEST_RENDERING_HELPER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -183,4 +183,4 @@ class RenderingHelper {
 
 }  // namespace media
 
-#endif  // MEDIA_GPU_RENDERING_HELPER_H_
+#endif  // MEDIA_GPU_TEST_RENDERING_HELPER_H_

media/gpu/video_accelerator_unittest_helpers.h → media/gpu/test/video_accelerator_unittest_helpers.h

@@ -4,8 +4,8 @@
 //
 // This file contains helper classes for video accelerator unittests.
 
-#ifndef MEDIA_GPU_VIDEO_ACCELERATOR_UNITTEST_HELPERS_H_
-#define MEDIA_GPU_VIDEO_ACCELERATOR_UNITTEST_HELPERS_H_
+#ifndef MEDIA_GPU_TEST_VIDEO_ACCELERATOR_UNITTEST_HELPERS_H_
+#define MEDIA_GPU_TEST_VIDEO_ACCELERATOR_UNITTEST_HELPERS_H_
 
 #include "base/containers/queue.h"
 #include "base/synchronization/condition_variable.h"
@@ -59,4 +59,4 @@ StateEnum ClientStateNotification<StateEnum>::Wait() {
 
 }  // namespace media
 
-#endif  // MEDIA_GPU_VIDEO_ACCELERATOR_UNITTEST_HELPERS_H_
+#endif  // MEDIA_GPU_TEST_VIDEO_ACCELERATOR_UNITTEST_HELPERS_H_

media/gpu/video_decode_accelerator_unittest.cc

@@ -63,8 +63,8 @@
 #include "media/gpu/fake_video_decode_accelerator.h"
 #include "media/gpu/format_utils.h"
 #include "media/gpu/gpu_video_decode_accelerator_factory.h"
-#include "media/gpu/rendering_helper.h"
-#include "media/gpu/video_accelerator_unittest_helpers.h"
+#include "media/gpu/test/rendering_helper.h"
+#include "media/gpu/test/video_accelerator_unittest_helpers.h"
 #include "media/video/h264_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/codec/png_codec.h"

media/gpu/video_encode_accelerator_unittest.cc

@@ -53,7 +53,7 @@
 #include "media/gpu/gpu_video_encode_accelerator_factory.h"
 #include "media/gpu/h264_decoder.h"
 #include "media/gpu/h264_dpb.h"
-#include "media/gpu/video_accelerator_unittest_helpers.h"
+#include "media/gpu/test/video_accelerator_unittest_helpers.h"
 #include "media/video/fake_video_encode_accelerator.h"
 #include "media/video/h264_parser.h"
 #include "media/video/video_encode_accelerator.h"