media/gpu/test: Move video test helper code to media/gpu/test to allow reuse.

This CL moves the video test helper code from media/gpu/test/video_player to
media/gpu/test. This will allow us to reuse the code in the video encoder and
other tests. A similar change has already been done for the image test helper
code.

TEST=./video_decode_accelerator_tests on hana

BUG=1045825

Change-Id: I5184042b14154e4d290563346e5d45d690286c83
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2026848Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Commit-Queue: David Staessens <dstaessens@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738084}

media/gpu/test/BUILD.gn

@@ -99,13 +99,13 @@ static_library("video_player_thumbnail_renderer") {
 static_library("video_player") {
   testonly = true
   sources = [
+    "video.cc",
+    "video.h",
     "video_player/frame_renderer.h",
     "video_player/frame_renderer_dummy.cc",
     "video_player/frame_renderer_dummy.h",
     "video_player/test_vda_video_decoder.cc",
     "video_player/test_vda_video_decoder.h",
-    "video_player/video.cc",
-    "video_player/video.h",
     "video_player/video_decoder_client.cc",
     "video_player/video_decoder_client.h",
     "video_player/video_player.cc",

media/gpu/test/video_player/video.cc → media/gpu/test/video.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/test/video_player/video.h"
+#include "media/gpu/test/video.h"
 
 #include <memory>
 #include <utility>

media/gpu/test/video_player/video.h → media/gpu/test/video.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_TEST_VIDEO_PLAYER_VIDEO_H_
-#define MEDIA_GPU_TEST_VIDEO_PLAYER_VIDEO_H_
+#ifndef MEDIA_GPU_TEST_VIDEO_H_
+#define MEDIA_GPU_TEST_VIDEO_H_
 
 #include <string>
 #include <vector>
@@ -108,4 +108,4 @@ class Video {
 }  // namespace test
 }  // namespace media
 
-#endif  // MEDIA_GPU_TEST_VIDEO_PLAYER_VIDEO_H_
+#endif  // MEDIA_GPU_TEST_VIDEO_H_

media/gpu/test/video_player/test_vda_video_decoder.cc

@@ -16,8 +16,8 @@
 #include "media/base/waiting.h"
 #include "media/gpu/gpu_video_decode_accelerator_factory.h"
 #include "media/gpu/macros.h"
+#include "media/gpu/test/video.h"
 #include "media/gpu/test/video_player/frame_renderer.h"
-#include "media/gpu/test/video_player/video.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)

media/gpu/test/video_player/video_decoder_client.cc

@@ -14,10 +14,10 @@
 #include "media/base/waiting.h"
 #include "media/gpu/buildflags.h"
 #include "media/gpu/macros.h"
+#include "media/gpu/test/video.h"
 #include "media/gpu/test/video_decode_accelerator_unittest_helpers.h"
 #include "media/gpu/test/video_player/frame_renderer.h"
 #include "media/gpu/test/video_player/test_vda_video_decoder.h"
-#include "media/gpu/test/video_player/video.h"
 
 #if BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
 #include "media/gpu/chromeos/chromeos_video_decoder_factory.h"

media/gpu/test/video_player/video_player.cc

@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "media/gpu/macros.h"
-#include "media/gpu/test/video_player/video.h"
+#include "media/gpu/test/video.h"
 #include "media/gpu/test/video_player/video_decoder_client.h"
 
 #define DVLOGF(level) DVLOG(level) << __func__ << "(): "

media/gpu/test/video_player/video_player_test_environment.cc

@@ -8,7 +8,7 @@
 
 #include "base/system/sys_info.h"
 #include "media/base/video_types.h"
-#include "media/gpu/test/video_player/video.h"
+#include "media/gpu/test/video.h"
 
 namespace media {
 namespace test {

media/gpu/video_decode_accelerator_perf_tests.cc

@@ -11,8 +11,8 @@
 #include "base/json/json_writer.h"
 #include "base/strings/stringprintf.h"
 #include "media/base/test_data_util.h"
+#include "media/gpu/test/video.h"
 #include "media/gpu/test/video_player/frame_renderer_dummy.h"
-#include "media/gpu/test/video_player/video.h"
 #include "media/gpu/test/video_player/video_decoder_client.h"
 #include "media/gpu/test/video_player/video_player.h"
 #include "media/gpu/test/video_player/video_player_test_environment.h"

media/gpu/video_decode_accelerator_tests.cc

@@ -8,11 +8,11 @@
 #include "base/files/file_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "media/base/test_data_util.h"
+#include "media/gpu/test/video.h"
 #include "media/gpu/test/video_frame_file_writer.h"
 #include "media/gpu/test/video_frame_validator.h"
 #include "media/gpu/test/video_player/frame_renderer_dummy.h"
 #include "media/gpu/test/video_player/frame_renderer_thumbnail.h"
-#include "media/gpu/test/video_player/video.h"
 #include "media/gpu/test/video_player/video_decoder_client.h"
 #include "media/gpu/test/video_player/video_player.h"
 #include "media/gpu/test/video_player/video_player_test_environment.h"