Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.

media/base/filter_collection.h

 // 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.
 
-#ifndef MEDIA_BASE_MEDIA_FILTER_COLLECTION_H_
-#define MEDIA_BASE_MEDIA_FILTER_COLLECTION_H_
+#ifndef MEDIA_BASE_FILTER_COLLECTION_H_
+#define MEDIA_BASE_FILTER_COLLECTION_H_
 
 #include <list>
 
 #include "base/ref_counted.h"
 #include "media/base/filters.h"
 
 namespace media {
 
-// This is a collection of MediaFilter objects used to form a media playback
+// This is a collection of Filter objects used to form a media playback
 // pipeline. See src/media/base/pipeline.h for more information.
-class MediaFilterCollection {
+class FilterCollection {
  public:
-  MediaFilterCollection();
+  FilterCollection();
 
   // Adds a filter to the collection.
   void AddDataSource(DataSource* filter);
   void AddDemuxer(Demuxer* filter);
   void AddVideoDecoder(VideoDecoder* filter);
   void AddAudioDecoder(AudioDecoder* filter);
   void AddVideoRenderer(VideoRenderer* filter);
   void AddAudioRenderer(AudioRenderer* filter);
 
   // Is the collection empty?
@@ skipping 15 matching lines @@
  private:
   // Identifies the type of filter implementation. Each filter has to be one of
   // the following types. This is used to mark, identify, and support
   // downcasting of different filter types stored in the filters_ list.
   enum FilterType {
     DATA_SOURCE,
     DEMUXER,
     AUDIO_DECODER,
     VIDEO_DECODER,
     AUDIO_RENDERER,
-    VIDEO_RENDERER
+    VIDEO_RENDERER,
   };
 
   // List of filters managed by this collection.
-  typedef std::pair<FilterType, scoped_refptr<MediaFilter> > FilterListElement;
+  typedef std::pair<FilterType, scoped_refptr<Filter> > FilterListElement;
   typedef std::list<FilterListElement> FilterList;
   FilterList filters_;
 
   // Helper function that adds a filter to the filter list.
-  void AddFilter(FilterType filter_type, MediaFilter* filter);
+  void AddFilter(FilterType filter_type, Filter* filter);
 
   // Helper function for SelectXXX() methods. It manages the
   // downcasting and mapping between FilterType and Filter class.
-  template<FilterType filter_type, class Filter>
-  void SelectFilter(scoped_refptr<Filter>* filter_out);
+  template<FilterType filter_type, typename F>
+  void SelectFilter(scoped_refptr<F>* filter_out);
 
-  // Helper function that searches the filters list for a specific
-  // filter type.
-  void SelectFilter(FilterType filter_type,
-                    scoped_refptr<MediaFilter>* filter_out);
+  // Helper function that searches the filters list for a specific filter type.
+  void SelectFilter(FilterType filter_type, scoped_refptr<Filter>* filter_out);
 
-  DISALLOW_COPY_AND_ASSIGN(MediaFilterCollection);
+  DISALLOW_COPY_AND_ASSIGN(FilterCollection);
 };
 
 }  // namespace media
 
-#endif  // MEDIA_BASE_MEDIA_FILTER_COLLECTION_H_
+#endif  // MEDIA_BASE_FILTER_COLLECTION_H_