Relanding Now fetching audio test tools from a separate bucket.

chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc

Index: chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc
diff --git a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc
index bbf903e541e3b397e579c35b044ad2969c19f33a..668725790169be403d2ebb41fef741996e76e93c 100644
--- a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc
@@ -48,14 +48,15 @@ static const char kMainWebrtcTestHtmlPage[] =
 
 // 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.
@@ -191,6 +192,7 @@ class AudioRecorder {
 
 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();
@@ -239,8 +241,14 @@ bool RemoveSilence(const base::FilePath& input_file,
   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
@@ -288,14 +296,15 @@ bool RunPesq(const base::FilePath& reference_file,
 
 #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;
   }