Fixed quality tests after PyAuto test purge.

chrome/browser/media/webrtc_browsertest_common.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 "chrome/browser/media/webrtc_browsertest_common.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/common/chrome_paths.h"
 #include "content/public/test/browser_test_utils.h"
 
 namespace test {
 
-const base::FilePath::CharType kReferenceVideosDirName[] =
-    FILE_PATH_LITERAL("webrtc.DEPS/webrtc_videos");
+// Relative to the chrome/test/data directory.
+const base::FilePath::CharType kReferenceFilesDirName[] =
+    FILE_PATH_LITERAL("webrtc/resources");
 const base::FilePath::CharType kReferenceFileName360p[] =
     FILE_PATH_LITERAL("reference_video_640x360_30fps");
 const base::FilePath::CharType kYuvFileExtension[] = FILE_PATH_LITERAL("yuv");
 const base::FilePath::CharType kY4mFileExtension[] = FILE_PATH_LITERAL("y4m");
 
 // This message describes how to modify your .gclient to get the reference
 // video files downloaded for you.
 static const char kAdviseOnGclientSolution[] =
     "You need to add this solution to your .gclient to run this test:\n"
     "{\n"
     "  \"name\"        : \"webrtc.DEPS\",\n"
     "  \"url\"         : \"svn://svn.chromium.org/chrome/trunk/deps/"
     "third_party/webrtc/webrtc.DEPS\",\n"
     "}";
 
 const int kDefaultPollIntervalMsec = 250;
 
-base::FilePath GetReferenceVideosDir() {
-  // FilePath does not tolerate relative paths, and we want to hang the
-  // kReferenceVideosDirName at the same level as Chromium codebase, so we
-  // need to subtract the trailing .../src manually from the path.
-  const size_t src_token_length = 3u;
-  const base::FilePath::StringType src_token(FILE_PATH_LITERAL("src"));
+base::FilePath GetReferenceFilesDir() {
+  base::FilePath test_data_dir;
+  PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
 
-  base::FilePath source_dir;
-  PathService::Get(base::DIR_SOURCE_ROOT, &source_dir);
-
-  base::FilePath::StringType path = source_dir.value();
-  DCHECK_GT(path.size(), src_token_length);
-  std::size_t found = path.rfind(src_token);
-  if (found != std::string::npos)
-    path.erase(found, src_token_length);

[kjellander_chromium, 2014/04/07 14:59:58]

Very nice to get rid of this hacky code!

-  return base::FilePath(path).Append(kReferenceVideosDirName);
+  return test_data_dir.Append(kReferenceFilesDirName);
 }
 
 bool HasReferenceFilesInCheckout() {
-  if (!base::PathExists(GetReferenceVideosDir())) {
+  if (!base::PathExists(GetReferenceFilesDir())) {
     LOG(ERROR)
         << "Cannot find the working directory for the reference video "
-        << "files, expected at " << GetReferenceVideosDir().value() << ". " <<
+        << "files, expected at " << GetReferenceFilesDir().value() << ". " <<
         kAdviseOnGclientSolution;
     return false;
   }
-  base::FilePath webrtc_reference_video_yuv = GetReferenceVideosDir()
+  base::FilePath webrtc_reference_video_yuv = GetReferenceFilesDir()
       .Append(kReferenceFileName360p).AddExtension(kYuvFileExtension);
   if (!base::PathExists(webrtc_reference_video_yuv)) {
     LOG(ERROR)
         << "Missing YUV reference video to be used for quality"
         << " comparison, expected at " << webrtc_reference_video_yuv.value()
         << ". " << kAdviseOnGclientSolution;
     return false;
   }
 
-  base::FilePath webrtc_reference_video_y4m = GetReferenceVideosDir()
+  base::FilePath webrtc_reference_video_y4m = GetReferenceFilesDir()
       .Append(kReferenceFileName360p).AddExtension(kY4mFileExtension);
   if (!base::PathExists(webrtc_reference_video_y4m)) {
     LOG(ERROR)
         << "Missing Y4M reference video to be used for quality"
         << " comparison, expected at "<< webrtc_reference_video_y4m.value()
         << ". " << kAdviseOnGclientSolution;
     return false;
   }
   return true;
 }
@@ skipping 89 matching lines @@
 void PeerConnectionServerRunner::KillAllPeerConnectionServers() {
   if (!base::KillProcesses(kServerExecutable, -1, NULL)) {
     LOG(ERROR) << "Failed to kill instances of " << kServerExecutable << ".";
     return;
   }
   base::WaitForProcessesToExit(kServerExecutable,
                                base::TimeDelta::FromSeconds(5), NULL);
 }
 
 }  // namespace test