Making WebRTC quality tests less dependent on installed tools.

chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc

Index: chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc
diff --git a/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc
index 7d1347ed9a6227b686fa8fd561e5552944f5e2b4..8a1e193cf64763ecc93834da034b151ffc38294c 100644
--- a/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc
@@ -157,12 +157,13 @@ class WebRtcVideoQualityBrowserTest : public WebRtcTestBase,
   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;
     }
 
@@ -208,7 +209,8 @@ class WebRtcVideoQualityBrowserTest : public WebRtcTestBase,
 
     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)) {
@@ -217,6 +219,17 @@ class WebRtcVideoQualityBrowserTest : public WebRtcTestBase,
       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);
@@ -234,6 +247,10 @@ class WebRtcVideoQualityBrowserTest : public WebRtcTestBase,
     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);