Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.

media/tools/player_wtl/movie.cc

Index: media/tools/player_wtl/movie.cc
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc
index 81ca6fe870ef4b25635f8ea44727e12912f911b7..5bb9effd17a8bd5a25271971043e54b9cc5dd79c 100644
--- a/media/tools/player_wtl/movie.cc
+++ b/media/tools/player_wtl/movie.cc
@@ -19,7 +19,7 @@ using media::FFmpegAudioDecoder;
 using media::FFmpegDemuxer;
 using media::FFmpegVideoDecoder;
 using media::FileDataSource;
-using media::MediaFilterCollection;
+using media::FilterCollection;
 using media::PipelineImpl;
 
 namespace media {
@@ -54,7 +54,7 @@ bool Movie::Open(const wchar_t* url, WtlVideoRenderer* video_renderer) {
   }
 
   // Create filter collection.
-  scoped_ptr<MediaFilterCollection> collection(new MediaFilterCollection());
+  scoped_ptr<FilterCollection> collection(new FilterCollection());
   collection->AddDataSource(new FileDataSource());
   collection->AddAudioDecoder(new FFmpegAudioDecoder());
   collection->AddDemuxer(new FFmpegDemuxer());