Moving MockFFmpeg to its own file and some media.gyp cleanup.

media/media.gyp

 # Copyright (c) 2009 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,
   },
   'includes': [
     '../build/common.gypi',
@@ skipping 39 matching lines @@
         'base/factory.h',
         'base/filter_host.h',
         'base/filter_host_impl.cc',
         'base/filter_host_impl.h',
         'base/filters.h',
         'base/media_posix.cc',
         'base/media_win.cc',
         'base/media.h',
         'base/media_format.cc',
         'base/media_format.h',
-        'base/mock_filter_host.h',
-        'base/mock_media_filters.h',
-        'base/mock_pipeline.h',
         'base/pipeline.h',
         'base/pipeline_impl.cc',
         'base/pipeline_impl.h',
         'base/seekable_buffer.cc',
         'base/seekable_buffer.h',
         'base/synchronizer.cc',
         'base/synchronizer.h',
         'base/video_frame_impl.cc',
         'base/video_frame_impl.h',
         'base/yuv_convert.cc',
@@ skipping 70 matching lines @@
         '../base/base.gyp:base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
       ],
       'sources': [
         'audio/win/audio_output_win_unittest.cc',
         'audio/mac/audio_output_mac_unittest.cc',
         'audio/simple_sources_unittest.cc',
         'base/data_buffer_unittest.cc',
+        'base/mock_ffmpeg.cc',
+        'base/mock_ffmpeg.h',
+        'base/mock_filter_host.h',
+        'base/mock_media_filters.h',
+        'base/mock_pipeline.h',
         'base/pipeline_impl_unittest.cc',
         'base/run_all_unittests.cc',
         'base/seekable_buffer_unittest.cc',
         'base/video_frame_impl_unittest.cc',
         'base/yuv_convert_unittest.cc',
         'filters/ffmpeg_demuxer_unittest.cc',
         'filters/ffmpeg_glue_unittest.cc',
         'filters/ffmpeg_video_decoder_unittest.cc',
         'filters/file_data_source_unittest.cc',
         'filters/video_decoder_unittest.cc',
         'filters/video_renderer_unittest.cc',
       ],
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
             # Needed for the following #include chain:
             #   base/run_all_unittests.cc
             #   ../base/test_suite.h
             #   gtk/gtk.h
             '../build/linux/system.gyp:gtk',
           ],
           'sources!': [
+            'base/mock_ffmpeg.cc',
             'filters/ffmpeg_demuxer_unittest.cc',
             'filters/ffmpeg_glue_unittest.cc',
             'filters/ffmpeg_video_decoder_unittest.cc',
           ],
         }],
         ['OS=="mac"', {
           'sources!': [
+            'base/mock_ffmpeg.cc',
             'filters/ffmpeg_demuxer_unittest.cc',
             'filters/ffmpeg_glue_unittest.cc',
             'filters/ffmpeg_video_decoder_unittest.cc',
           ],
         }],
       ],
     },
     {
       'target_name': 'media_bench',
       'type': 'executable',
@@ skipping 21 matching lines @@
           ],
           'include_dirs': [
             '../chrome/third_party/wtl/include',
           ],
           'dependencies': [
             'media',
             '../base/base.gyp:base',
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
           'sources': [
-            'player/list.h',
-            'player/mainfrm.h',
-            'player/movie.cc',
-            'player/movie.h',
-            'player/player_wtl.cc',
-            'player/player_wtl.rc',
-            'player/props.h',
-            'player/seek.h',
-            'player/resource.h',
-            'player/stdafx.h',
-            'player/view.h',
-            'player/wtl_renderer.cc',
-            'player/wtl_renderer.h',
-          ],
+            'player/list.h',
+            'player/mainfrm.h',
+            'player/movie.cc',
+            'player/movie.h',
+            'player/player_wtl.cc',
+            'player/player_wtl.rc',
+            'player/props.h',
+            'player/seek.h',
+            'player/resource.h',
+            'player/stdafx.h',
+            'player/view.h',
+            'player/wtl_renderer.cc',
+            'player/wtl_renderer.h',
+          ],
           'msvs_settings': {
             'VCLinkerTool': {
               'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
             },
           },
         },
       ],
     }],
   ],
 }