Remove screen capturers from media/video/capture/screen.

media/media.gyp

 # Copyright (c) 2012 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,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 33 matching lines @@
     {
       'target_name': 'media',
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
         '../crypto/crypto.gyp:crypto',
         '../skia/skia.gyp:skia',
         '../third_party/opus/opus.gyp:opus',
         '../ui/ui.gyp:ui',
         '../url/url.gyp:url_lib',
+        '../third_party/webrtc/modules/modules.gyp:desktop_capture',
       ],
       'defines': [
         'MEDIA_IMPLEMENTATION',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'audio/agc_audio_stream.h',
         'audio/android/audio_manager_android.cc',
@@ skipping 312 matching lines @@
         'video/capture/android/video_capture_device_android.cc',
         'video/capture/android/video_capture_device_android.h',
         'video/capture/fake_video_capture_device.cc',
         'video/capture/fake_video_capture_device.h',
         'video/capture/linux/video_capture_device_linux.cc',
         'video/capture/linux/video_capture_device_linux.h',
         'video/capture/mac/video_capture_device_mac.h',
         'video/capture/mac/video_capture_device_mac.mm',
         'video/capture/mac/video_capture_device_qtkit_mac.h',
         'video/capture/mac/video_capture_device_qtkit_mac.mm',
-        'video/capture/screen/differ.cc',
-        'video/capture/screen/differ.h',
-        'video/capture/screen/differ_block.cc',
-        'video/capture/screen/differ_block.h',
-        'video/capture/screen/mac/desktop_configuration.h',
-        'video/capture/screen/mac/desktop_configuration.mm',
-        'video/capture/screen/mac/scoped_pixel_buffer_object.cc',
-        'video/capture/screen/mac/scoped_pixel_buffer_object.h',
-        'video/capture/screen/mouse_cursor_shape.h',
+
+        # TODO(sergeyu): Move screen_capture_device.cc to content and remove it
+        # from here.
         'video/capture/screen/screen_capture_device.cc',
         'video/capture/screen/screen_capture_device.h',
-        'video/capture/screen/screen_capture_frame_queue.cc',
-        'video/capture/screen/screen_capture_frame_queue.h',
-        'video/capture/screen/screen_capturer.h',
-        'video/capture/screen/screen_capturer_fake.cc',
-        'video/capture/screen/screen_capturer_fake.h',
-        'video/capture/screen/screen_capturer_helper.cc',
-        'video/capture/screen/screen_capturer_helper.h',
-        'video/capture/screen/screen_capturer_mac.mm',
-        'video/capture/screen/screen_capturer_null.cc',
-        'video/capture/screen/screen_capturer_win.cc',
-        'video/capture/screen/screen_capturer_x11.cc',
-        'video/capture/screen/shared_desktop_frame.cc',
-        'video/capture/screen/shared_desktop_frame.h',
-        'video/capture/screen/win/desktop.cc',
-        'video/capture/screen/win/desktop.h',
-        'video/capture/screen/win/scoped_thread_desktop.cc',
-        'video/capture/screen/win/scoped_thread_desktop.h',
-        'video/capture/screen/x11/x_server_pixel_buffer.cc',
-        'video/capture/screen/x11/x_server_pixel_buffer.h',
         'video/capture/video_capture.h',
         'video/capture/video_capture_device.h',
         'video/capture/video_capture_device_dummy.cc',
         'video/capture/video_capture_device_dummy.h',
         'video/capture/video_capture_proxy.cc',
         'video/capture/video_capture_proxy.h',
         'video/capture/video_capture_types.h',
         'video/capture/win/capability_list_win.cc',
         'video/capture/win/capability_list_win.h',
         'video/capture/win/filter_base_win.cc',
@@ skipping 42 matching lines @@
         'include_dirs': [
           '..',
         ],
       },
       'conditions': [
         ['arm_neon==1', {
           'defines': [
             'USE_NEON'
           ],
         }],
-        ['OS!="linux" or use_x11==1', {
-          'sources!': [
-            'video/capture/screen/screen_capturer_null.cc',
-          ]
-        }],
         ['OS!="ios"', {
           'dependencies': [
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             'shared_memory_support',
           ],
         }],
         ['media_use_ffmpeg==1', {
           'dependencies': [
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
@@ skipping 365 matching lines @@
             'mp4/es_descriptor.cc',
             'mp4/es_descriptor.h',
             'mp4/mp4_stream_parser.cc',
             'mp4/mp4_stream_parser.h',
             'mp4/offset_byte_queue.cc',
             'mp4/offset_byte_queue.h',
             'mp4/track_run_iterator.cc',
             'mp4/track_run_iterator.h',
           ],
         }],
-        ['screen_capture_supported==1', {

[DaleCurtis, 2013/06/06 00:22:42]

TODO() remove this? There's a big chunk at the top setting it.

[Sergey Ulanov, 2013/06/06 21:13:58]

Done.

-          'dependencies': [
-            '../third_party/webrtc/modules/modules.gyp:desktop_capture',
-          ],
-        }, {
-          'sources/': [
-            ['exclude', '^video/capture/screen/'],

[DaleCurtis, 2013/06/06 00:22:42]

Don't think you can remove this yet, since you'll end up including files on
iOS/Android that weren't there before.

[Sergey Ulanov, 2013/06/06 21:13:58]

Done.

-          ],
-        }],
         ['toolkit_uses_gtk==1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
         }],
         # ios check is necessary due to http://crbug.com/172682.
         ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', {
           'dependencies': [
             'media_asm',
             'media_mmx',
@@ skipping 118 matching lines @@
         'filters/ffmpeg_video_decoder_unittest.cc',
         'filters/file_data_source_unittest.cc',
         'filters/h264_to_annex_b_bitstream_converter_unittest.cc',
         'filters/pipeline_integration_test.cc',
         'filters/pipeline_integration_test_base.cc',
         'filters/skcanvas_video_renderer_unittest.cc',
         'filters/source_buffer_stream_unittest.cc',
         'filters/video_decoder_selector_unittest.cc',
         'filters/video_frame_stream_unittest.cc',
         'filters/video_renderer_base_unittest.cc',
-        'video/capture/screen/differ_block_unittest.cc',
-        'video/capture/screen/differ_unittest.cc',
         'video/capture/screen/screen_capture_device_unittest.cc',
-        'video/capture/screen/screen_capturer_helper_unittest.cc',
-        'video/capture/screen/screen_capturer_mac_unittest.cc',
-        'video/capture/screen/screen_capturer_unittest.cc',

[alexeypa (please no reviews), 2013/06/06 20:16:20]

nit: Do we run
|../third_party/webrtc/modules/modules.gyp:desktop_capture_unittests| routinely
on the main (or some other) waterfall?

[Sergey Ulanov, 2013/06/06 21:13:58]

Yes, I enabled them on the webrtc buildbots:
http://build.chromium.org/p/client.webrtc/console

         'video/capture/video_capture_device_unittest.cc',
         'webm/cluster_builder.cc',
         'webm/cluster_builder.h',
         'webm/tracks_builder.cc',
         'webm/tracks_builder.h',
         'webm/webm_cluster_parser_unittest.cc',
         'webm/webm_content_encodings_client_unittest.cc',
         'webm/webm_parser_unittest.cc',
         'webm/webm_tracks_parser_unittest.cc',
         'webm/webm_webvtt_parser_unittest.cc',
@@ skipping 135 matching lines @@
         'base/mock_audio_renderer_sink.cc',
         'base/mock_audio_renderer_sink.h',
         'base/mock_data_source_host.cc',
         'base/mock_data_source_host.h',
         'base/mock_demuxer_host.cc',
         'base/mock_demuxer_host.h',
         'base/mock_filters.cc',
         'base/mock_filters.h',
         'base/test_helpers.cc',
         'base/test_helpers.h',
-        'video/capture/screen/screen_capturer_mock_objects.cc',
-        'video/capture/screen/screen_capturer_mock_objects.h',
-      ],
-      'conditions': [
-        ['screen_capture_supported==1', {
-          'dependencies': [
-            '../third_party/webrtc/modules/modules.gyp:desktop_capture',
-          ],
-        }, {
-          'sources/': [
-            ['exclude', '^video/capture/screen/'],

[DaleCurtis, 2013/06/06 00:22:42]

Ditto.

[Sergey Ulanov, 2013/06/06 21:13:58]

This target no longer depends on desktop_capture module.

-          ],
-        }],
       ],
     },
   ],
   'conditions': [
     ['OS!="ios" and target_arch!="arm"', {
       'targets': [
        {
           'target_name': 'media_asm',
           'type': 'static_library',
           'sources': [
@@ skipping 124 matching lines @@
           'include_dirs': [
             '..',
           ],
           'defines': [
             'MEDIA_IMPLEMENTATION',
           ],
           'sources': [
             'base/simd/convert_rgb_to_yuv_sse2.cc',
             'base/simd/convert_rgb_to_yuv_ssse3.cc',
             'base/simd/filter_yuv_sse2.cc',
-            'video/capture/screen/differ_block_sse2.cc',
-            'video/capture/screen/differ_block_sse2.h',
           ],
         },
         {
           'target_name': 'shared_memory_support_sse',
           'type': 'static_library',
           'cflags': [
             '-msse',
           ],
           'include_dirs': [
             '..',
@@ skipping 358 matching lines @@
           'sources': [
             'tools/media_bench/media_bench.cc',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         },
       ],
     }],
   ],
 }