media/gpu/test: Fix video decode performance tests not using output folder.

CL crrev.com/c/1831728 introduced extra command line options to the
video_decode_accelerator_tests. Unfortunately this change caused the
video_decode_accelerator_perf_tests to ignore the '--output_folder' parameter.
This is causing all tast.video.DecodeAccel(VD)Perf* tests to fail.

TEST=./video_decode_accelerator_perf_tests --output_folder=test_folder

BUG=b:142515248

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

media/gpu/test/video_player/video_player_test_environment.cc

@@ -23,8 +23,8 @@ VideoPlayerTestEnvironment* VideoPlayerTestEnvironment::Create(
     const base::FilePath& video_metadata_path,
     bool enable_validator,
     bool use_vd,
-    const FrameOutputConfig& frame_output_config,
-    const base::FilePath& output_folder) {
+    const base::FilePath& output_folder,
+    const FrameOutputConfig& frame_output_config) {
   auto video = std::make_unique<media::test::Video>(
       video_path.empty() ? base::FilePath(kDefaultTestVideoPath) : video_path,
       video_metadata_path);
@@ -34,16 +34,16 @@ VideoPlayerTestEnvironment* VideoPlayerTestEnvironment::Create(
   }
 
   return new VideoPlayerTestEnvironment(std::move(video), enable_validator,
-                                        use_vd, frame_output_config,
-                                        output_folder);
+                                        use_vd, output_folder,
+                                        frame_output_config);
 }
 
 VideoPlayerTestEnvironment::VideoPlayerTestEnvironment(
     std::unique_ptr<media::test::Video> video,
     bool enable_validator,
     bool use_vd,
-    const FrameOutputConfig& frame_output_config,
-    const base::FilePath& output_folder)
+    const base::FilePath& output_folder,
+    const FrameOutputConfig& frame_output_config)
     : video_(std::move(video)),
       enable_validator_(enable_validator),
       use_vd_(use_vd),

media/gpu/test/video_player/video_player_test_environment.h

@@ -48,8 +48,8 @@ class VideoPlayerTestEnvironment : public VideoTestEnvironment {
       const base::FilePath& video_metadata_path,
       bool enable_validator,
       bool use_vd,
-      const FrameOutputConfig& frame_output_config = FrameOutputConfig(),
-      const base::FilePath& output_folder = base::FilePath());
+      const base::FilePath& output_folder = base::FilePath(),
+      const FrameOutputConfig& frame_output_config = FrameOutputConfig());
   ~VideoPlayerTestEnvironment() override;
 
   // Set up video test environment, called once for entire test run.
@@ -84,8 +84,8 @@ class VideoPlayerTestEnvironment : public VideoTestEnvironment {
   VideoPlayerTestEnvironment(std::unique_ptr<media::test::Video> video,
                              bool enable_validator,
                              bool use_vd,
-                             const FrameOutputConfig& frame_output_config,
-                             const base::FilePath& output_folder);
+                             const base::FilePath& output_folder,
+                             const FrameOutputConfig& frame_output_config);
 
   const std::unique_ptr<media::test::Video> video_;
   const bool enable_validator_;

media/gpu/video_decode_accelerator_perf_tests.cc

@@ -423,7 +423,8 @@ int main(int argc, char** argv) {
   // Set up our test environment.
   media::test::VideoPlayerTestEnvironment* test_environment =
       media::test::VideoPlayerTestEnvironment::Create(
-          video_path, video_metadata_path, false, use_vd);
+          video_path, video_metadata_path, false, use_vd,
+          base::FilePath(output_folder));
   if (!test_environment)
     return EXIT_FAILURE;
 

media/gpu/video_decode_accelerator_tests.cc

@@ -472,7 +472,7 @@ int main(int argc, char** argv) {
   media::test::VideoPlayerTestEnvironment* test_environment =
       media::test::VideoPlayerTestEnvironment::Create(
           video_path, video_metadata_path, enable_validator, use_vd,
-          frame_output_config, base::FilePath(output_folder));
+          base::FilePath(output_folder), frame_output_config);
   if (!test_environment)
     return EXIT_FAILURE;