Move VideoDecoder initialization into VideoRendererBase.

media/base/filter_collection.cc

Index: media/base/filter_collection.cc
diff --git a/media/base/filter_collection.cc b/media/base/filter_collection.cc
index 0b10f5f5c12f7f2b5ff8a6fa12adce99e6b98a6c..f0992026e50d200dac076e112379890750930d8d 100644
--- a/media/base/filter_collection.cc
+++ b/media/base/filter_collection.cc
@@ -29,10 +29,6 @@ void FilterCollection::AddAudioDecoder(AudioDecoder* audio_decoder) {
   audio_decoders_.push_back(audio_decoder);
 }
 
-void FilterCollection::AddVideoDecoder(VideoDecoder* video_decoder) {
-  video_decoders_.push_back(video_decoder);
-}
-
 void FilterCollection::AddAudioRenderer(AudioRenderer* audio_renderer) {
   audio_renderers_.push_back(audio_renderer);
 }
@@ -41,13 +37,6 @@ void FilterCollection::AddVideoRenderer(VideoRenderer* video_renderer) {
   video_renderers_.push_back(video_renderer);
 }
 
-bool FilterCollection::IsEmpty() const {
-  return audio_decoders_.empty() &&
-      video_decoders_.empty() &&
-      audio_renderers_.empty() &&
-      video_renderers_.empty();
-}
-
 void FilterCollection::Clear() {
   audio_decoders_.clear();
   video_decoders_.clear();
@@ -64,15 +53,6 @@ void FilterCollection::SelectAudioDecoder(scoped_refptr<AudioDecoder>* out) {
   audio_decoders_.pop_front();
 }
 
-void FilterCollection::SelectVideoDecoder(scoped_refptr<VideoDecoder>* out) {
-  if (video_decoders_.empty()) {
-    *out = NULL;
-    return;
-  }
-  *out = video_decoders_.front();
-  video_decoders_.pop_front();
-}
-
 void FilterCollection::SelectAudioRenderer(scoped_refptr<AudioRenderer>* out) {
   if (audio_renderers_.empty()) {
     *out = NULL;
@@ -91,4 +71,9 @@ void FilterCollection::SelectVideoRenderer(scoped_refptr<VideoRenderer>* out) {
   video_renderers_.pop_front();
 }
 
+FilterCollection::VideoDecoderList*
+FilterCollection::GetVideoDecoders() {
+  return &video_decoders_;
+}
+
 }  // namespace media