Replace MockFilterCallback with MockCallback and simplify unit tests.

media/media.gyp

 # Copyright (c) 2011 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 319 matching lines @@
       'type': '<(library)',
       'dependencies': [
         'media',
         '../base/base.gyp:base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         'audio/test_audio_input_controller_factory.cc',
         'audio/test_audio_input_controller_factory.h',
+        'base/mock_callback.cc',
+        'base/mock_callback.h',
         'base/mock_filter_host.cc',
         'base/mock_filter_host.h',
         'base/mock_filters.cc',
         'base/mock_filters.h',
       ],
     },
     {
       'target_name': 'media_bench',
       'type': 'executable',
       'msvs_guid': '45BC4F87-4604-4962-A751-7C7B29A080BF',
@@ skipping 293 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: