Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(706)

Unified Diff: media/gpu/jpeg_decode_accelerator_unittest.cc

Issue 2922323003: JDA unittest: don't require the test file in /media/test/data/. (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« media/base/test_data_util.cc ('K') | « media/base/test_data_util.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/jpeg_decode_accelerator_unittest.cc
diff --git a/media/gpu/jpeg_decode_accelerator_unittest.cc b/media/gpu/jpeg_decode_accelerator_unittest.cc
index 93c9934ecb079c58be5ded329c84c3032bc767d1..420283c65a917967e06c1fbbb17dd59dfba8b149 100644
--- a/media/gpu/jpeg_decode_accelerator_unittest.cc
+++ b/media/gpu/jpeg_decode_accelerator_unittest.cc
@@ -359,7 +359,8 @@ void JpegDecodeAcceleratorTestEnvironment::SetUp() {
ASSERT_NO_FATAL_FAILURE(ReadTestJpegImage(test_640x360_jpeg_file_,
image_data_640x360_black_.get()));
- base::FilePath default_jpeg_file = GetTestDataFilePath(kDefaultJpegFilename);
+ base::FilePath default_jpeg_file =
+ GetOriginalOrTestDataFilePath(kDefaultJpegFilename);
image_data_1280x720_default_.reset(new TestImageFile(kDefaultJpegFilename));
ASSERT_NO_FATAL_FAILURE(
ReadTestJpegImage(default_jpeg_file, image_data_1280x720_default_.get()));
@@ -375,7 +376,7 @@ void JpegDecodeAcceleratorTestEnvironment::SetUp() {
user_jpeg_filenames_, base::FilePath::StringType(1, ';'),
base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
for (const auto& filename : filenames) {
- base::FilePath input_file = GetTestDataFilePath(filename);
+ base::FilePath input_file = GetOriginalOrTestDataFilePath(filename);
auto image_data = base::MakeUnique<TestImageFile>(filename);
ASSERT_NO_FATAL_FAILURE(ReadTestJpegImage(input_file, image_data.get()));
image_data_user_.push_back(std::move(image_data));
« media/base/test_data_util.cc ('K') | « media/base/test_data_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698