diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 18:10:42 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 18:10:42 +0000 |
| commit | 92e4afc1fbcb3850b505e5caceabbbcca491974a (patch) | |
| tree | 8068f2be68df618aade295db81e5be32aeb1b13f /media/base/run_all_unittests.cc | |
| parent | 3d143e9b4beec02c615bd47a6a267a0ba24992cd (diff) | |
| download | chromium_src-92e4afc1fbcb3850b505e5caceabbbcca491974a.zip chromium_src-92e4afc1fbcb3850b505e5caceabbbcca491974a.tar.gz chromium_src-92e4afc1fbcb3850b505e5caceabbbcca491974a.tar.bz2 | |
Revert 96974 - Remove mock_ffmpeg and update media unittests.
BUG=92429
TEST=BitstreamConverterTest.*, ChunkDemuxerTest.*, FFmpegDemuxerTest.*, FFmpegGlueTest.*, FFmpegVideoDecoderTest.*, FFmpegH264BitstreamConverterTest.*, FFmpegVideoDecodeEngineTest.*
Review URL: http://codereview.chromium.org/7587012
TBR=acolwell@chromium.org
Review URL: http://codereview.chromium.org/7658017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96977 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, 2 insertions, 7 deletions
diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc index a24a278..b715a328b 100644 --- a/media/base/run_all_unittests.cc +++ b/media/base/run_all_unittests.cc @@ -1,14 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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) { - base::TestSuite suite(argc, argv); - - media::InitializeMediaLibraryForTesting(); - - return suite.Run(); + return base::TestSuite(argc, argv).Run(); } |