Revert 66125 -- Broke Windows build - Move FilterType into MediaFilterCollect...

media/base/pipeline_impl.cc

Index: media/base/pipeline_impl.cc
===================================================================
--- media/base/pipeline_impl.cc	(revision 66137)
+++ media/base/pipeline_impl.cc	(working copy)
@@ -954,7 +954,7 @@
 
   scoped_refptr<DataSource> data_source;
   while (true) {
-    filter_collection_->SelectDataSource(&data_source);
+    filter_collection_->SelectFilter(&data_source);
     if (!data_source || data_source->IsUrlSupported(url_))
       break;
   }
@@ -979,7 +979,7 @@
 
   CHECK(data_source);
 
-  filter_collection_->SelectDemuxer(&demuxer);
+  filter_collection_->SelectFilter(&demuxer);
   if (!demuxer) {
     SetError(PIPELINE_ERROR_REQUIRED_FILTER_MISSING);
     return;
@@ -1001,7 +1001,7 @@
 
   if (stream) {
     scoped_refptr<AudioDecoder> audio_decoder;
-    filter_collection_->SelectAudioDecoder(&audio_decoder);
+    filter_collection_->SelectFilter(&audio_decoder);
 
     if (audio_decoder) {
       PrepareFilter(audio_decoder);
@@ -1028,7 +1028,7 @@
 
   if (stream) {
     scoped_refptr<VideoDecoder> video_decoder;
-    filter_collection_->SelectVideoDecoder(&video_decoder);
+    filter_collection_->SelectFilter(&video_decoder);
 
     if (video_decoder) {
       PrepareFilter(video_decoder);
@@ -1050,7 +1050,7 @@
   DCHECK(IsPipelineOk());
 
   if (decoder) {
-    filter_collection_->SelectAudioRenderer(&audio_renderer_);
+    filter_collection_->SelectFilter(&audio_renderer_);
 
     if (audio_renderer_) {
       PrepareFilter(audio_renderer_);
@@ -1070,7 +1070,7 @@
   DCHECK(IsPipelineOk());
 
   if (decoder) {
-    filter_collection_->SelectVideoRenderer(&video_renderer_);
+    filter_collection_->SelectFilter(&video_renderer_);
 
     if (video_renderer_) {
       PrepareFilter(video_renderer_);