summaryrefslogtreecommitdiffstats
path: root/media/media.gyp
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 09:30:32 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 09:30:32 +0000
commitd399866c2fe77410afed5be486f2b72581823bed (patch)
treeb7da4bc8b767ed87053ce974642598db1d1a6b4a /media/media.gyp
parent12bb3e11aac582a23034e3538a689e9a3a28da86 (diff)
downloadchromium_src-d399866c2fe77410afed5be486f2b72581823bed.zip
chromium_src-d399866c2fe77410afed5be486f2b72581823bed.tar.gz
chromium_src-d399866c2fe77410afed5be486f2b72581823bed.tar.bz2
Fold media::PipelineImpl into media::Pipeline as there is only one implementation of the interface.
Three years ago I thought that having a separate interface would be A Good Thing. Needless to say there has never been a case where having an interface defintion of Pipeline came in handy as all clients create and access PipelineImpl objects directly. Review URL: http://codereview.chromium.org/9243025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r--media/media.gyp5
1 files changed, 2 insertions, 3 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 8bfe118..4d550df 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -148,9 +148,8 @@
'base/message_loop_factory.h',
'base/message_loop_factory_impl.cc',
'base/message_loop_factory_impl.h',
+ 'base/pipeline.cc',
'base/pipeline.h',
- 'base/pipeline_impl.cc',
- 'base/pipeline_impl.h',
'base/pipeline_status.h',
'base/preload.h',
'base/pts_heap.cc',
@@ -605,7 +604,7 @@
'base/filter_collection_unittest.cc',
'base/h264_bitstream_converter_unittest.cc',
'base/mock_reader.h',
- 'base/pipeline_impl_unittest.cc',
+ 'base/pipeline_unittest.cc',
'base/pts_heap_unittest.cc',
'base/pts_stream_unittest.cc',
'base/run_all_unittests.cc',