diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 17:49:51 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 17:49:51 +0000 |
| commit | 3161eec0578ab99cf7c03ccacfef26b9de1ca919 (patch) | |
| tree | 1572d4ea35598597566ad5dc9db2085bd19f9937 /media | |
| parent | 8c7a4df50983b4bf2b5edc5946ddccb093baddbf (diff) | |
| download | chromium_src-3161eec0578ab99cf7c03ccacfef26b9de1ca919.zip chromium_src-3161eec0578ab99cf7c03ccacfef26b9de1ca919.tar.gz chromium_src-3161eec0578ab99cf7c03ccacfef26b9de1ca919.tar.bz2 | |
Removing video_decoder_unittest.cc as it tests nothing.
ffmpeg_video_decoder_unittest.cc is a much more comprehensive test!
BUG=16008
TEST=none
Review URL: http://codereview.chromium.org/155198
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/video_decoder_unittest.cc | 36 | ||||
| -rw-r--r-- | media/media.gyp | 1 |
2 files changed, 0 insertions, 37 deletions
diff --git a/media/filters/video_decoder_unittest.cc b/media/filters/video_decoder_unittest.cc deleted file mode 100644 index 621371c..0000000 --- a/media/filters/video_decoder_unittest.cc +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) 2009 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 <string> - -#include "media/base/factory.h" -#include "media/base/filter_host.h" -#include "media/base/filters.h" -#include "media/base/media_format.h" -#include "media/base/mock_media_filters.h" -#include "media/base/pipeline_impl.h" -#include "media/filters/test_video_decoder.h" -#include "testing/gtest/include/gtest/gtest.h" - -using media::FilterFactoryCollection; -using media::InstanceFilterFactory; -using media::PipelineImpl; -using media::TestVideoDecoder; -using media::old_mocks::InitializationHelper; -using media::old_mocks::MockFilterConfig; -using media::old_mocks::MockFilterFactory; - -TEST(VideoDecoder, CreateTestDecoder) { - std::string url(""); - PipelineImpl p; - scoped_refptr<TestVideoDecoder> test_decoder = new TestVideoDecoder(); - MockFilterConfig config; - scoped_refptr<FilterFactoryCollection> c = new FilterFactoryCollection(); - c->AddFactory(new InstanceFilterFactory<TestVideoDecoder>(test_decoder)); - c->AddFactory(new MockFilterFactory(&config)); - InitializationHelper h; - h.Start(&p, c, url); - p.SetPlaybackRate(1.0f); - p.Stop(); -} diff --git a/media/media.gyp b/media/media.gyp index 1b20982..669f08e 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -167,7 +167,6 @@ 'filters/ffmpeg_glue_unittest.cc', 'filters/ffmpeg_video_decoder_unittest.cc', 'filters/file_data_source_unittest.cc', - 'filters/video_decoder_unittest.cc', ], 'conditions': [ ['OS=="linux"', { |