Revert r180578, r180591, and r180604 from 1410 branch.

media/media.gyp

 # Copyright (c) 2012 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,
     # Override to dynamically link the PulseAudio library.
     'use_pulseaudio%': 0,
     # Override to dynamically link the cras (ChromeOS audio) library.
@@ skipping 770 matching lines @@
         'base/audio_splicer_unittest.cc',
         'base/audio_timestamp_helper_unittest.cc',
         'base/bind_to_loop_unittest.cc',
         'base/bit_reader_unittest.cc',
         'base/channel_mixer_unittest.cc',
         'base/clock_unittest.cc',
         'base/data_buffer_unittest.cc',
         'base/decoder_buffer_queue_unittest.cc',
         'base/decoder_buffer_unittest.cc',
         'base/djb2_unittest.cc',
+        'base/filter_collection_unittest.cc',
         'base/gmock_callback_support_unittest.cc',
         'base/multi_channel_resampler_unittest.cc',
         'base/pipeline_unittest.cc',
         'base/ranges_unittest.cc',
         'base/run_all_unittests.cc',
         'base/seekable_buffer_unittest.cc',
         'base/sinc_resampler_unittest.cc',
         'base/test_data_util.cc',
         'base/test_data_util.h',
         'base/vector_math_testing.h',
@@ skipping 673 matching lines @@
           ],
           'sources': [
             'video/capture/screen/differ_block_sse2.cc',
             'video/capture/screen/differ_block_sse2.h',
           ],
         }, # end of target differ_block_sse2
       ],
     }],
   ],
 }