summaryrefslogtreecommitdiffstats
path: root/media/ffmpeg
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-14 17:31:23 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-14 17:31:23 +0000
commitda978a8dbce277274eaeff4cfa5878d11b17b591 (patch)
treecebecd3e8da40421fe4709e438301f512df39ad9 /media/ffmpeg
parentcbcdbdf3aa4e1c694880003114239fbfd73572ab (diff)
downloadchromium_src-da978a8dbce277274eaeff4cfa5878d11b17b591.zip
chromium_src-da978a8dbce277274eaeff4cfa5878d11b17b591.tar.gz
chromium_src-da978a8dbce277274eaeff4cfa5878d11b17b591.tar.bz2
Reimplement FileDataSource using file_util::MemoryMappedFile and convert to using FilePath.
This time without breaking the build! git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg')
-rw-r--r--media/ffmpeg/ffmpeg_regression_tests.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/media/ffmpeg/ffmpeg_regression_tests.cc b/media/ffmpeg/ffmpeg_regression_tests.cc
index 8fce919..9f0873a 100644
--- a/media/ffmpeg/ffmpeg_regression_tests.cc
+++ b/media/ffmpeg/ffmpeg_regression_tests.cc
@@ -334,7 +334,7 @@ FLAKY_FFMPEG_TEST_CASE(MP4_10, "security/null1.m4a");
TEST_P(FFmpegRegressionTest, BasicPlayback) {
if (GetParam().init_status == PIPELINE_OK) {
- ASSERT_TRUE(Start(GetTestDataURL(GetParam().filename),
+ ASSERT_TRUE(Start(GetTestDataFilePath(GetParam().filename),
GetParam().init_status, true));
Play();
ASSERT_EQ(WaitUntilEndedOrError(), GetParam().end_status);
@@ -349,7 +349,7 @@ TEST_P(FFmpegRegressionTest, BasicPlayback) {
Seek(base::TimeDelta::FromMilliseconds(0));
}
} else {
- ASSERT_FALSE(Start(GetTestDataURL(GetParam().filename),
+ ASSERT_FALSE(Start(GetTestDataFilePath(GetParam().filename),
GetParam().init_status, true));
EXPECT_EQ(GetVideoHash(), GetParam().video_md5);
EXPECT_EQ(GetAudioHash(), GetParam().audio_md5);
@@ -357,7 +357,7 @@ TEST_P(FFmpegRegressionTest, BasicPlayback) {
}
TEST_P(FlakyFFmpegRegressionTest, BasicPlayback) {
- if (Start(GetTestDataURL(GetParam().filename))) {
+ if (Start(GetTestDataFilePath(GetParam().filename))) {
Play();
WaitUntilEndedOrError();
}