Revert 66125 -- Broke Windows build - Move FilterType into MediaFilterCollect...

media/base/mock_filters.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.
 //
 // A new breed of mock media filters, this time using gmock!  Feel free to add
 // actions if you need interesting side-effects (i.e., copying data to the
 // buffer passed into MockDataSource::Read()).
 //
 // Don't forget you can use StrictMock<> and NiceMock<> if you want the mock
 // filters to fail the test or do nothing when an unexpected method is called.
@@ skipping 275 matching lines @@
   MockAudioRenderer* audio_renderer() const { return audio_renderer_; }
 
   MediaFilterCollection* filter_collection() const {
     return filter_collection(true);
   }
 
   MediaFilterCollection* filter_collection(bool include_data_source) const {
     MediaFilterCollection* collection = new MediaFilterCollection();
 
     if (include_data_source) {
-      collection->AddDataSource(data_source_);
+      collection->AddFilter(data_source_);
     }
-    collection->AddDemuxer(demuxer_);
-    collection->AddVideoDecoder(video_decoder_);
-    collection->AddAudioDecoder(audio_decoder_);
-    collection->AddVideoRenderer(video_renderer_);
-    collection->AddAudioRenderer(audio_renderer_);
+    collection->AddFilter(demuxer_);
+    collection->AddFilter(video_decoder_);
+    collection->AddFilter(audio_decoder_);
+    collection->AddFilter(video_renderer_);
+    collection->AddFilter(audio_renderer_);
     return collection;
   }
 
  private:
   scoped_refptr<MockDataSource> data_source_;
   scoped_refptr<MockDemuxer> demuxer_;
   scoped_refptr<MockVideoDecoder> video_decoder_;
   scoped_refptr<MockAudioDecoder> audio_decoder_;
   scoped_refptr<MockVideoRenderer> video_renderer_;
   scoped_refptr<MockAudioRenderer> audio_renderer_;
@@ skipping 41 matching lines @@
 
 // Helper gmock action that calls DisableAudioRenderer() on behalf of the
 // provided filter.
 ACTION_P(DisableAudioRenderer, filter) {
   filter->host()->DisableAudioRenderer();
 }
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOCK_FILTERS_H_