Relanding Now fetching audio test tools from a separate bucket.

chrome/browser/media/chrome_webrtc_audio_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 <ctime>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
@@ skipping 30 matching lines @@
     "resources/human-voice-win.wav";
 #else
     "resources/human-voice-linux.wav";
 #endif
 
 static const char kMainWebrtcTestHtmlPage[] =
     "/webrtc/webrtc_audio_quality_test.html";
 
 // Test we can set up a WebRTC call and play audio through it.
 //
-// You must have the src-internal solution in your .gclient to put the required
-// pyauto_private directory into chrome/test/data/.
+// If you're not a googler and want to run this test, you need to provide a
+// pesq binary for your platform (and sox.exe on windows). Read more on how
+// resources are managed in chrome/test/data/webrtc/resources/README.
 //
 // This test will only work on machines that have been configured to record
 // their own input.
 //
 // On Linux:
-// 1. # sudo apt-get install pavucontrol
+// 1. # sudo apt-get install pavucontrol sox
 // 2. For the user who will run the test: # pavucontrol
 // 3. In a separate terminal, # arecord dummy
 // 4. In pavucontrol, go to the recording tab.
 // 5. For the ALSA plug-in [aplay]: ALSA Capture from, change from <x> to
 //    <Monitor of x>, where x is whatever your primary sound device is called.
 // 6. Try launching chrome as the target user on the target machine, try
 //    playing, say, a YouTube video, and record with # arecord -f dat tmp.dat.
 //    Verify the recording with aplay (should have recorded what you played
 //    from chrome).
 //
@@ skipping 115 matching lines @@
     int exit_code = -1;
     base::WaitForExitCode(recording_application_, &exit_code);
     return exit_code == 0;
   }
  private:
   base::ProcessHandle recording_application_;
 };
 
 bool ForceMicrophoneVolumeTo100Percent() {
 #if defined(OS_WIN)
+  // Note: the force binary isn't in tools since it's one of our own.
   CommandLine command_line(test::GetReferenceFilesDir().Append(
       FILE_PATH_LITERAL("force_mic_volume_max.exe")));
   VLOG(0) << "Running " << command_line.GetCommandLineString();
   std::string result;
   if (!base::GetAppOutput(command_line, &result)) {
     LOG(ERROR) << "Failed to set source volume: output was " << result;
     return false;
   }
 #else
   // Just force the volume of, say the first 5 devices. A machine will rarely
@@ skipping 28 matching lines @@
   // ABOVE_PERIODS: The period for which silence occurs. Value 1 is used for
   //                 silence at beginning of audio.
   // DURATION: the amount of time in seconds that non-silence must be detected
   //           before sox stops trimming audio.
   // THRESHOLD: value used to indicate what sample value is treates as silence.
   const char* kAbovePeriods = "1";
   const char* kDuration = "2";
   const char* kTreshold = "5%";
 
 #if defined(OS_WIN)
-  CommandLine command_line(test::GetReferenceFilesDir().Append(
-      FILE_PATH_LITERAL("sox.exe")));
+  base::FilePath sox_path = test::GetReferenceFilesDir().Append(
+      FILE_PATH_LITERAL("tools/sox.exe"));
+  if (!base::PathExists(sox_path)) {
+    LOG(ERROR) << "Missing sox.exe binary in " << sox_path.value()
+               << "; you may have to provide this binary yourself.";
+    return false;
+  }
+  CommandLine command_line(sox_path);
 #else
   CommandLine command_line(base::FilePath(FILE_PATH_LITERAL("sox")));
 #endif
   command_line.AppendArgPath(input_file);
   command_line.AppendArgPath(output_file);
   command_line.AppendArg("silence");
   command_line.AppendArg(kAbovePeriods);
   command_line.AppendArg(kDuration);
   command_line.AppendArg(kTreshold);
   command_line.AppendArg("reverse");
@@ skipping 27 matching lines @@
 // "3.145", etc). Returns true on success.
 bool RunPesq(const base::FilePath& reference_file,
              const base::FilePath& actual_file,
              int sample_rate, std::string* raw_mos, std::string* mos_lqo) {
   // PESQ will break if the paths are too long (!).
   EXPECT_LT(reference_file.value().length(), 128u);
   EXPECT_LT(actual_file.value().length(), 128u);
 
 #if defined(OS_WIN)
   base::FilePath pesq_path =
-      test::GetReferenceFilesDir().Append(FILE_PATH_LITERAL("pesq.exe"));
+      test::GetReferenceFilesDir().Append(FILE_PATH_LITERAL("tools/pesq.exe"));
 #else
   base::FilePath pesq_path =
-      test::GetReferenceFilesDir().Append(FILE_PATH_LITERAL("pesq"));
+      test::GetReferenceFilesDir().Append(FILE_PATH_LITERAL("tools/pesq"));
 #endif
 
   if (!base::PathExists(pesq_path)) {
-    LOG(ERROR) << "Missing PESQ binary in " << pesq_path.value();
+    LOG(ERROR) << "Missing PESQ binary in " << pesq_path.value()
+               << "; you may have to provide this binary yourself.";
     return false;
   }
 
   CommandLine command_line(pesq_path);
   command_line.AppendArg(base::StringPrintf("+%d", sample_rate));
   command_line.AppendArgPath(reference_file);
   command_line.AppendArgPath(actual_file);
 
   VLOG(0) << "Running " << command_line.GetCommandLineString();
   std::string result;
@@ skipping 98 matching lines @@
       test::GetReferenceFilesDir().Append(kReferenceFile);
   ASSERT_TRUE(RunPesq(reference_file_in_test_dir, trimmed_recording, 16000,
                       &raw_mos, &mos_lqo));
 
   perf_test::PrintResult("audio_pesq", "", "raw_mos", raw_mos, "score", true);
   perf_test::PrintResult("audio_pesq", "", "mos_lqo", mos_lqo, "score", true);
 
   EXPECT_TRUE(base::DeleteFile(recording, false));
   EXPECT_TRUE(base::DeleteFile(trimmed_recording, false));
 }