Re-organizing all tools under /src/media to be consistent with the rest of the repository.

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,
   },
   'target_defaults': {
     'conditions': [
@@ skipping 198 matching lines @@
     {
       'target_name': 'media_bench',
       'type': 'executable',
       'msvs_guid': '45BC4F87-4604-4962-A751-7C7B29A080BF',
       'dependencies': [
         'media',
         '../base/base.gyp:base',
         '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
       ],
       'sources': [
-        'bench/bench.cc',
-        'bench/file_protocol.cc',
-        'bench/file_protocol.h',
+        'tools/media_bench/file_protocol.cc',
+        'tools/media_bench/file_protocol.h',
+        'tools/media_bench/media_bench.cc',
       ],
     },
     {
       'target_name': 'wav_ola_test',
       'type': 'executable',
       'dependencies': [
         'media',
       ],
       'sources': [
-        'tools/wav_ola_test.cc'
+        'tools/wav_ola_test/wav_ola_test.cc'
       ],
     },
     {
       'target_name': 'qt_faststart',
       'type': 'executable',
       'sources': [
-        'tools/qt_faststart.c'
+        'tools/qt_faststart/qt_faststart.c'
       ],
     },
     {
       'target_name': 'omx_test',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../third_party/openmax/openmax.gyp:il',
       ],
       'sources': [
         'omx/input_buffer.cc',
         'omx/input_buffer.h',
         'omx/omx_test.cc',
         'omx/omx_video_decoder.cc',
         'omx/omx_video_decoder.h',
       ],
     },
   ],
   'conditions': [
     ['OS=="win"', {
       'targets': [
         {
-          'target_name': 'media_player',
+          'target_name': 'player_wtl',
           'type': 'executable',
           'dependencies': [
             'media',
             '../base/base.gyp:base',
           ],
           'include_dirs': [
             '../chrome/third_party/wtl/include',
           ],
           '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/view.h',
-            'player/wtl_renderer.cc',
-            'player/wtl_renderer.h',
+            'tools/player_wtl/list.h',
+            'tools/player_wtl/mainfrm.h',
+            'tools/player_wtl/movie.cc',
+            'tools/player_wtl/movie.h',
+            'tools/player_wtl/player_wtl.cc',
+            'tools/player_wtl/player_wtl.rc',
+            'tools/player_wtl/props.h',
+            'tools/player_wtl/seek.h',
+            'tools/player_wtl/resource.h',
+            'tools/player_wtl/view.h',
+            'tools/player_wtl/wtl_renderer.cc',
+            'tools/player_wtl/wtl_renderer.h',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
               'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
             },
           },
           'defines': [
             '_CRT_SECURE_NO_WARNINGS=1',
           ],
         },
       ],
     }],
     ['OS=="linux"', {
       'targets': [
         {
-          'target_name': 'media_player',
+          'target_name': 'player_x11',
           'type': 'executable',
           'dependencies': [
             'media',
             '../base/base.gyp:base',
           ],
           'link_settings': {
             'libraries': [
               '-lX11',
               '-lXrender',
               '-lXext',
             ],
           },
           'sources': [
-            'player/player_x11.cc',
-            'player/x11_video_renderer.cc',
-            'player/x11_video_renderer.h',
+            'tools/player_x11/player_x11.cc',
+            'tools/player_x11/x11_video_renderer.cc',
+            'tools/player_x11/x11_video_renderer.h',
           ],
         },
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: