Move FilterType into MediaFilterCollection

webkit/glue/webmediaplayer_impl.cc

Index: webkit/glue/webmediaplayer_impl.cc
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
index 02d98ca466c0e5ff50b6bd3fea64e2ac4c447c1a..bbf6172ff394afe82449e7a1641fe2667f072646 100644
--- a/webkit/glue/webmediaplayer_impl.cc
+++ b/webkit/glue/webmediaplayer_impl.cc
@@ -278,18 +278,18 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
   proxy_->SetDataSource(buffered_data_source);
 
   if (use_simple_data_source) {
-    filter_collection_->AddFilter(simple_data_source);
-    filter_collection_->AddFilter(buffered_data_source);
+    filter_collection_->AddDataSource(simple_data_source);
+    filter_collection_->AddDataSource(buffered_data_source);
   } else {
-    filter_collection_->AddFilter(buffered_data_source);
-    filter_collection_->AddFilter(simple_data_source);
+    filter_collection_->AddDataSource(buffered_data_source);
+    filter_collection_->AddDataSource(simple_data_source);
   }
 
   // Add in the default filter factories.
-  filter_collection_->AddFilter(new media::FFmpegDemuxer());
-  filter_collection_->AddFilter(new media::FFmpegAudioDecoder());
-  filter_collection_->AddFilter(new media::FFmpegVideoDecoder(NULL));
-  filter_collection_->AddFilter(new media::NullAudioRenderer());
+  filter_collection_->AddDemuxer(new media::FFmpegDemuxer());
+  filter_collection_->AddAudioDecoder(new media::FFmpegAudioDecoder());
+  filter_collection_->AddVideoDecoder(new media::FFmpegVideoDecoder(NULL));
+  filter_collection_->AddAudioRenderer(new media::NullAudioRenderer());
 }
 
 WebMediaPlayerImpl::~WebMediaPlayerImpl() {