Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.

media/media.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
     'player_x11_renderer%': 'x11',
   },
   'targets': [
@@ skipping 62 matching lines @@
         'base/buffers.h',
         'base/callback.cc',
         'base/callback.h',
         'base/clock.h',
         'base/clock_impl.cc',
         'base/clock_impl.h',
         'base/data_buffer.cc',
         'base/data_buffer.h',
         'base/djb2.cc',
         'base/djb2.h',
+        'base/filter_collection.cc',
+        'base/filter_collection.h',
         'base/filter_host.h',
         'base/filters.cc',
         'base/filters.h',
         'base/media.h',
-        'base/media_filter_collection.cc',
-        'base/media_filter_collection.h',
         'base/media_format.cc',
         'base/media_format.h',
         'base/media_posix.cc',
         'base/media_switches.cc',
         'base/media_switches.h',
         'base/media_win.cc',
         'base/pipeline.h',
         'base/pipeline_impl.cc',
         'base/pipeline_impl.h',
         'base/pts_heap.cc',
@@ skipping 164 matching lines @@
         'audio/audio_parameters_unittest.cc',
         'audio/audio_util_unittest.cc',
         'audio/fake_audio_input_stream_unittest.cc',
         'audio/linux/alsa_output_unittest.cc',
         'audio/mac/audio_output_mac_unittest.cc',
         'audio/simple_sources_unittest.cc',
         'audio/win/audio_output_win_unittest.cc',
         'base/clock_impl_unittest.cc',
         'base/data_buffer_unittest.cc',
         'base/djb2_unittest.cc',
-        'base/media_filter_collection_unittest.cc',
+        'base/filter_collection_unittest.cc',
         'base/mock_ffmpeg.cc',
         'base/mock_ffmpeg.h',
         'base/mock_filter_host.h',
         'base/mock_filters.cc',
         'base/mock_filters.h',
         'base/mock_reader.h',
         'base/mock_task.h',
         'base/pipeline_impl_unittest.cc',
         'base/pts_heap_unittest.cc',
         'base/run_all_unittests.cc',
@@ skipping 348 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: