diff options
author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 17:53:58 +0000 |
---|---|---|
committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 17:53:58 +0000 |
commit | c25c7be488ea694d9173374b985e73a5a6eed867 (patch) | |
tree | 292a92b9c69fa73fe4ec0a0db22fe7ab8ece947e /media/base/media_posix.cc | |
parent | 461da7bce5a15d2c74237f0d284923fe5f2ebd9b (diff) | |
download | chromium_src-c25c7be488ea694d9173374b985e73a5a6eed867.zip chromium_src-c25c7be488ea694d9173374b985e73a5a6eed867.tar.gz chromium_src-c25c7be488ea694d9173374b985e73a5a6eed867.tar.bz2 |
Remove mock_ffmpeg and update media unittests.
BUG=92429
TEST=BitstreamConverterTest.*, ChunkDemuxerTest.*, FFmpegDemuxerTest.*, FFmpegGlueTest.*, FFmpegVideoDecoderTest.*, FFmpegH264BitstreamConverterTest.*, FFmpegVideoDecodeEngineTest.*
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=96974
Review URL: http://codereview.chromium.org/7587012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97886 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/media_posix.cc')
-rw-r--r-- | media/base/media_posix.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/media/base/media_posix.cc b/media/base/media_posix.cc index adad88b..7be3255 100644 --- a/media/base/media_posix.cc +++ b/media/base/media_posix.cc @@ -92,6 +92,12 @@ bool InitializeMediaLibrary(const FilePath& module_dir) { return g_media_library_is_initialized; } +void InitializeMediaLibraryForTesting() { + FilePath file_path; + CHECK(PathService::Get(base::DIR_EXE, &file_path)); + CHECK(InitializeMediaLibrary(file_path)); +} + bool IsMediaLibraryInitialized() { return g_media_library_is_initialized; } |