Move FilterType into MediaFilterCollection

media/base/filters.h

Index: media/base/filters.h
diff --git a/media/base/filters.h b/media/base/filters.h
index d12e3e8ccf23aba8b26f34604245f86f95e03d9c..a9b5d6adcd68ac27ba96213d8530ad60c7924bed 100644
--- a/media/base/filters.h
+++ b/media/base/filters.h
@@ -44,18 +44,6 @@ class FilterHost;
 class MediaFilter;
 class WritableBuffer;
 
-// Identifies the type of filter implementation. Each filter has to be one of
-// the following types. This is used to identify filter object during
-// initialization of pipeline.
-enum FilterType {
-  FILTER_DATA_SOURCE,
-  FILTER_DEMUXER,
-  FILTER_AUDIO_DECODER,
-  FILTER_VIDEO_DECODER,
-  FILTER_AUDIO_RENDERER,
-  FILTER_VIDEO_RENDERER
-};
-
 // Used for completing asynchronous methods.
 typedef Callback0::Type FilterCallback;
 
@@ -63,10 +51,6 @@ class MediaFilter : public base::RefCountedThreadSafe<MediaFilter> {
  public:
   MediaFilter();
 
-  // Return the type of this filter. All implementor has to provide this
-  // method.
-  virtual FilterType filter_type() const = 0;
-
   // Return the major mime type for this filter.
   virtual const char* major_mime_type() const;
 
@@ -147,9 +131,6 @@ class DataSource : public MediaFilter {
 
   virtual bool IsUrlSupported(const std::string& url);
 
-  static FilterType static_filter_type() { return FILTER_DATA_SOURCE; }
-  virtual FilterType filter_type() const;
-
   // Initialize a DataSource for the given URL, executing the callback upon
   // completion.
   virtual void Initialize(const std::string& url, FilterCallback* callback) = 0;
@@ -174,9 +155,6 @@ class DataSource : public MediaFilter {
 
 class Demuxer : public MediaFilter {
  public:
-  static FilterType static_filter_type() { return FILTER_DEMUXER; }
-  virtual FilterType filter_type() const;
-
   virtual bool requires_message_loop() const;
   virtual const char* message_loop_name() const;
 
@@ -233,9 +211,6 @@ class DemuxerStream : public base::RefCountedThreadSafe<DemuxerStream> {
 
 class VideoDecoder : public MediaFilter {
  public:
-  static FilterType static_filter_type() { return FILTER_VIDEO_DECODER; }
-  virtual FilterType filter_type() const;
-
   virtual const char* major_mime_type() const;
   virtual bool requires_message_loop() const;
   virtual const char* message_loop_name() const;
@@ -281,9 +256,6 @@ class VideoDecoder : public MediaFilter {
 
 class AudioDecoder : public MediaFilter {
  public:
-  static FilterType static_filter_type() { return FILTER_AUDIO_DECODER; }
-  virtual FilterType filter_type() const;
-
   virtual const char* major_mime_type() const;
   virtual bool requires_message_loop() const;
   virtual const char* message_loop_name() const;
@@ -323,9 +295,6 @@ class AudioDecoder : public MediaFilter {
 
 class VideoRenderer : public MediaFilter {
  public:
-  static FilterType static_filter_type() { return FILTER_VIDEO_RENDERER; }
-  virtual FilterType filter_type() const;
-
   virtual const char* major_mime_type() const;
 
   // Initialize a VideoRenderer with the given VideoDecoder, executing the
@@ -340,9 +309,6 @@ class VideoRenderer : public MediaFilter {
 
 class AudioRenderer : public MediaFilter {
  public:
-  static FilterType static_filter_type() { return FILTER_AUDIO_RENDERER; }
-  virtual FilterType filter_type() const;
-
   virtual const char* major_mime_type() const;
 
   // Initialize a AudioRenderer with the given AudioDecoder, executing the