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/run_all_unittests.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/run_all_unittests.cc')
| -rw-r--r-- | media/base/run_all_unittests.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc index b715a328b..a24a278 100644 --- a/media/base/run_all_unittests.cc +++ b/media/base/run_all_unittests.cc @@ -1,9 +1,14 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "base/test/test_suite.h" +#include "media/base/media.h" int main(int argc, char** argv) { - return base::TestSuite(argc, argv).Run(); + base::TestSuite suite(argc, argv); + + media::InitializeMediaLibraryForTesting(); + + return suite.Run(); } |