diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 10:51:07 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 10:51:07 +0000 |
| commit | e53d3ff360d9b38fd7c9469cfcad1554e989cbc1 (patch) | |
| tree | 7f7ecae295cede0c7b278ebefb3fa481f75c62e6 /media/ffmpeg | |
| parent | a9eb92e5aacf23874b075d2f707150e7d9578cd4 (diff) | |
| download | chromium_src-e53d3ff360d9b38fd7c9469cfcad1554e989cbc1.zip chromium_src-e53d3ff360d9b38fd7c9469cfcad1554e989cbc1.tar.gz chromium_src-e53d3ff360d9b38fd7c9469cfcad1554e989cbc1.tar.bz2 | |
Revert 167638 - Reimplement FileDataSource using file_util::MemoryMappedFile and convert to using FilePath.
Review URL: https://chromiumcodereview.appspot.com/11360229
TBR=scherkus@chromium.org
Review URL: https://codereview.chromium.org/11361258
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg')
| -rw-r--r-- | media/ffmpeg/ffmpeg_regression_tests.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/ffmpeg/ffmpeg_regression_tests.cc b/media/ffmpeg/ffmpeg_regression_tests.cc index 0b4dd40..8fce919 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(GetTestDataFilePath(GetParam().filename), + ASSERT_TRUE(Start(GetTestDataURL(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(GetTestDataFilePath(GetParam().filename), + ASSERT_FALSE(Start(GetTestDataURL(GetParam().filename), GetParam().init_status, true)); EXPECT_EQ(GetVideoHash(), GetParam().video_md5); EXPECT_EQ(GetAudioHash(), GetParam().audio_md5); |