Fixit: Move tab and desktop capture code to new location.

content/content_browser.gypi

Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index f24002d00e5c399725c2c39367a2ff9b276c2453..efbb11e7c2c24b07b6640e0c3a775059b7928837 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -731,6 +731,20 @@
     'browser/media/android/media_drm_credential_manager.h',
     'browser/media/android/media_resource_getter_impl.cc',
     'browser/media/android/media_resource_getter_impl.h',
+    'browser/media/capture/audio_mirroring_manager.cc',
+    'browser/media/capture/audio_mirroring_manager.h',
+    'browser/media/capture/content_video_capture_device_core.cc',
+    'browser/media/capture/content_video_capture_device_core.h',
+    'browser/media/capture/video_capture_oracle.cc',
+    'browser/media/capture/video_capture_oracle.h',
+    'browser/media/capture/web_contents_audio_input_stream.cc',
+    'browser/media/capture/web_contents_audio_input_stream.h',
+    'browser/media/capture/web_contents_capture_util.cc',
+    'browser/media/capture/web_contents_capture_util.h',
+    'browser/media/capture/web_contents_tracker.cc',
+    'browser/media/capture/web_contents_tracker.h',
+    'browser/media/capture/web_contents_video_capture_device.cc',
+    'browser/media/capture/web_contents_video_capture_device.h',
     'browser/media/media_devices_monitor.cc',
     'browser/media/media_internals.cc',
     'browser/media/media_internals.h',
@@ -932,14 +946,10 @@
     'browser/renderer_host/media/audio_input_renderer_host.h',
     'browser/renderer_host/media/audio_input_sync_writer.cc',
     'browser/renderer_host/media/audio_input_sync_writer.h',
-    'browser/renderer_host/media/audio_mirroring_manager.cc',
-    'browser/renderer_host/media/audio_mirroring_manager.h',
     'browser/renderer_host/media/audio_renderer_host.cc',
     'browser/renderer_host/media/audio_renderer_host.h',
     'browser/renderer_host/media/audio_sync_reader.cc',
     'browser/renderer_host/media/audio_sync_reader.h',
-    'browser/renderer_host/media/content_video_capture_device_core.cc',
-    'browser/renderer_host/media/content_video_capture_device_core.h',
     'browser/renderer_host/media/device_request_message_filter.cc',
     'browser/renderer_host/media/device_request_message_filter.h',
     'browser/renderer_host/media/media_stream_dispatcher_host.cc',
@@ -964,16 +974,6 @@
     'browser/renderer_host/media/video_capture_host.h',
     'browser/renderer_host/media/video_capture_manager.cc',
     'browser/renderer_host/media/video_capture_manager.h',
-    'browser/renderer_host/media/video_capture_oracle.cc',
-    'browser/renderer_host/media/video_capture_oracle.h',
-    'browser/renderer_host/media/web_contents_audio_input_stream.cc',
-    'browser/renderer_host/media/web_contents_audio_input_stream.h',
-    'browser/renderer_host/media/web_contents_capture_util.cc',
-    'browser/renderer_host/media/web_contents_capture_util.h',
-    'browser/renderer_host/media/web_contents_tracker.cc',
-    'browser/renderer_host/media/web_contents_tracker.h',
-    'browser/renderer_host/media/web_contents_video_capture_device.cc',
-    'browser/renderer_host/media/web_contents_video_capture_device.h',
     'browser/renderer_host/memory_benchmark_message_filter.cc',
     'browser/renderer_host/memory_benchmark_message_filter.h',
     'browser/renderer_host/native_web_keyboard_event.cc',
@@ -1408,10 +1408,10 @@
     }],
     ['enable_webrtc==1 and (OS=="linux" or OS=="mac" or OS=="win")', {
       'sources': [
-        'browser/renderer_host/media/desktop_capture_device.cc',
-        'browser/renderer_host/media/desktop_capture_device.h',
-        'browser/renderer_host/media/desktop_capture_device_aura.cc',
-        'browser/renderer_host/media/desktop_capture_device_aura.h',
+        'browser/media/capture/desktop_capture_device.cc',
+        'browser/media/capture/desktop_capture_device.h',
+        'browser/media/capture/desktop_capture_device_aura.cc',
+        'browser/media/capture/desktop_capture_device_aura.h',
       ],
       'dependencies': [
         '../third_party/webrtc/modules/modules.gyp:desktop_capture',