Have media content and chrome browser tests load data from media/test/data

media/base/test_data_util.cc

Index: media/base/test_data_util.cc
diff --git a/media/base/test_data_util.cc b/media/base/test_data_util.cc
index a83fa840b41c70ed4e36f11bfdc3d900fc2a079a..558bc7d0a8487366abbcdeb22d9a59924255abd7 100644
--- a/media/base/test_data_util.cc
+++ b/media/base/test_data_util.cc
@@ -15,11 +15,11 @@ namespace media {
 base::FilePath GetTestDataFilePath(const std::string& name) {
   base::FilePath file_path;
   CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &file_path));
+  return file_path.Append(GetTestDataPath()).AppendASCII(name);
+}
 
-  return file_path.AppendASCII("media")
-      .AppendASCII("test")
-      .AppendASCII("data")
-      .AppendASCII(name);
+base::FilePath GetTestDataPath() {
+  return base::FilePath(FILE_PATH_LITERAL("media/test/data"));
 }
 
 scoped_refptr<DecoderBuffer> ReadTestDataFile(const std::string& name) {