Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.

media/tools/player_wtl/movie.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/tools/player_wtl/movie.h"
 
 #include "base/utf_string_conversions.h"
 #include "media/base/pipeline_impl.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source.h"
 #include "media/filters/null_audio_renderer.h"
 #include "media/tools/player_wtl/wtl_renderer.h"
 
 using media::AudioRendererImpl;
 using media::FFmpegAudioDecoder;
 using media::FFmpegDemuxer;
 using media::FFmpegVideoDecoder;
 using media::FileDataSource;
-using media::MediaFilterCollection;
+using media::FilterCollection;
 using media::PipelineImpl;
 
 namespace media {
 
 Movie::Movie()
     : enable_audio_(true),
       enable_draw_(true),
       enable_dump_yuv_file_(false),
       enable_pause_(false),
       max_threads_(0),
@@ skipping 14 matching lines @@
   movie_hwnd_ = hwnd;
 }
 
 bool Movie::Open(const wchar_t* url, WtlVideoRenderer* video_renderer) {
   // Close previous movie.
   if (pipeline_) {
     Close();
   }
 
   // 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());
   collection->AddVideoDecoder(new FFmpegVideoDecoder(NULL));
 
   if (enable_audio_) {
     collection->AddAudioRenderer(new AudioRendererImpl());
   } else {
     collection->AddAudioRenderer(new media::NullAudioRenderer());
   }
@@ skipping 93 matching lines @@
 void Movie::Close() {
   if (pipeline_) {
     pipeline_->Stop(NULL);
     thread_->Stop();
     pipeline_ = NULL;
     thread_.reset();
   }
 }
 
 }  // namespace media