Refactor some code that depends on FFmpeg

media/media.gyp

Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 07d527194cf2bb1c39d33c053cc2ab237441cb61..af218a1f1b4154768ef1265f0559ff6e4317e4d3 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -87,8 +87,12 @@
         'base/yuv_row_mac.cc',
         'base/yuv_row_linux.cc',
         'base/yuv_row.h',
+        'ffmpeg/ffmpeg_common.cc',
+        'ffmpeg/ffmpeg_common.h',
         'ffmpeg/ffmpeg_util.cc',
         'ffmpeg/ffmpeg_util.h',
+        'ffmpeg/file_protocol.cc',
+        'ffmpeg/file_protocol.h',
         'filters/audio_renderer_algorithm_base.cc',
         'filters/audio_renderer_algorithm_base.h',
         'filters/audio_renderer_algorithm_default.cc',
@@ -104,8 +108,6 @@
         'filters/decoder_base.h',
         'filters/ffmpeg_audio_decoder.cc',
         'filters/ffmpeg_audio_decoder.h',
-        'filters/ffmpeg_common.cc',
-        'filters/ffmpeg_common.h',
         'filters/ffmpeg_demuxer.cc',
         'filters/ffmpeg_demuxer.h',
         'filters/ffmpeg_glue.cc',
@@ -243,8 +245,6 @@
         '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
       ],
       'sources': [
-        'tools/media_bench/file_protocol.cc',
-        'tools/media_bench/file_protocol.h',
         'tools/media_bench/media_bench.cc',
       ],
     },
@@ -273,7 +273,7 @@
         '../base/base.gyp:base',
       ],
       'sources': [
-        'omx/omx_test.cc',
+        'tools/omx_test/omx_test.cc',
       ],
     },
     {