Making WebRTC quality tests less dependent on installed tools.

chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 139 matching lines @@
 
   // Runs the RGBA to I420 converter on the video in |capture_video_filename|,
   // which should contain frames of size |width| x |height|.
   //
   // The rgba_to_i420_converter is part of the webrtc_test_tools target which
   // should be build prior to running this test. The resulting binary should
   // live next to Chrome.
   bool RunARGBtoI420Converter(int width,
                               int height,
                               const base::FilePath& captured_video_filename) {
-    base::FilePath path_to_converter = base::MakeAbsoluteFilePath(
-        GetBrowserDir().Append(kArgbToI420ConverterExecutable));
+    base::FilePath path_to_converter =
+        GetBrowserDir().Append(kArgbToI420ConverterExecutable);
 
     if (!base::PathExists(path_to_converter)) {
       LOG(ERROR) << "Missing ARGB->I420 converter: should be in "
-          << path_to_converter.value();
+          << path_to_converter.value()
+          << ". Try building the chromium_builder_webrtc target.";
       return false;
     }
 
     base::CommandLine converter_command(path_to_converter);
     converter_command.AppendSwitchPath("--frames_dir", GetWorkingDir());
     converter_command.AppendSwitchPath("--output_file",
                                        captured_video_filename);
     converter_command.AppendSwitchASCII("--width",
                                         base::StringPrintf("%d", width));
     converter_command.AppendSwitchASCII("--height",
@@ skipping 25 matching lines @@
       const base::FilePath& reference_video_filename,
       const base::FilePath& stats_file) {
 
     base::FilePath path_to_analyzer = base::MakeAbsoluteFilePath(
         GetBrowserDir().Append(kFrameAnalyzerExecutable));
     base::FilePath path_to_compare_script = GetSourceDir().Append(
         FILE_PATH_LITERAL("third_party/webrtc/tools/compare_videos.py"));
 
     if (!base::PathExists(path_to_analyzer)) {
       LOG(ERROR) << "Missing frame analyzer: should be in "
-          << path_to_analyzer.value();
+          << path_to_analyzer.value()
+          << ". Try building the chromium_builder_webrtc target.";
       return false;
     }
     if (!base::PathExists(path_to_compare_script)) {
       LOG(ERROR) << "Missing video compare script: should be in "
           << path_to_compare_script.value();
       return false;
     }
 
+    base::FilePath path_to_zxing = test::GetToolForPlatform("zxing");
+    if (!base::PathExists(path_to_zxing)) {
+      LOG(ERROR) << "Missing zxing: should be in " << path_to_zxing.value();
+      return false;
+    }
+    base::FilePath path_to_ffmpeg = test::GetToolForPlatform("ffmpeg");
+    if (!base::PathExists(path_to_ffmpeg)) {
+      LOG(ERROR) << "Missing ffmpeg: should be in " << path_to_ffmpeg.value();
+      return false;
+    }
+
     // Note: don't append switches to this command since it will mess up the
     // -u in the python invocation!
     base::CommandLine compare_command(base::CommandLine::NO_PROGRAM);
     EXPECT_TRUE(GetPythonCommand(&compare_command));
 
     compare_command.AppendArgPath(path_to_compare_script);
     compare_command.AppendArg(base::StringPrintf("--label=%s", test_label));
     compare_command.AppendArg("--ref_video");
     compare_command.AppendArgPath(reference_video_filename);
     compare_command.AppendArg("--test_video");
     compare_command.AppendArgPath(captured_video_filename);
     compare_command.AppendArg("--frame_analyzer");
     compare_command.AppendArgPath(path_to_analyzer);
     compare_command.AppendArg("--yuv_frame_width");
     compare_command.AppendArg(base::StringPrintf("%d", width));
     compare_command.AppendArg("--yuv_frame_height");
     compare_command.AppendArg(base::StringPrintf("%d", height));
+    compare_command.AppendArg("--zxing_path");
+    compare_command.AppendArgPath(path_to_zxing);
+    compare_command.AppendArg("--ffmpeg_path");
+    compare_command.AppendArgPath(path_to_ffmpeg);
     compare_command.AppendArg("--stats_file");
     compare_command.AppendArgPath(stats_file);
 
     DVLOG(0) << "Running " << compare_command.GetCommandLineString();
     std::string output;
     bool ok = base::GetAppOutput(compare_command, &output);
 
     // Print to stdout to ensure the perf numbers are parsed properly by the
     // buildbot step. The tool should print a handful RESULT lines.
     printf("Output was:\n\n%s\n", output.c_str());
@@ skipping 85 matching lines @@
   ASSERT_TRUE(CompareVideosAndPrintResult(
       test_config_.test_name,
       test_config_.width,
       test_config_.height,
       GetWorkingDir().Append(kCapturedYuvFileName),
       test::GetReferenceFilesDir()
           .Append(test_config_.reference_video)
           .AddExtension(test::kYuvFileExtension),
       GetWorkingDir().Append(kStatsFileName)));
 }