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

remoting/remoting.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': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
 
@@ skipping 279 matching lines @@
         {
           'target_name': 'remoting_host',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             'remoting_base',
             'remoting_jingle_glue',
             'remoting_protocol',
             '../crypto/crypto.gyp:crypto',
             '../google_apis/google_apis.gyp:google_apis',
-            '../media/media.gyp:media',
             '../ipc/ipc.gyp:ipc',
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',
           ],
           'defines': [
             'VERSION=<(version_full)',
           ],
           'sources': [
             'host/audio_capturer.cc',
             'host/audio_capturer.h',
             'host/audio_capturer_linux.cc',
@@ skipping 236 matching lines @@
           ],
         },  # end of target 'remoting_host'
 
         {
           'target_name': 'remoting_me2me_host_static',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
-            '../media/media.gyp:media',
             '../net/net.gyp:net',
+            '../third_party/webrtc/modules/modules.gyp:desktop_capture',
             'remoting_base',
             'remoting_breakpad',
             'remoting_host',
             'remoting_host_event_logger',
             'remoting_host_logging',
             'remoting_jingle_glue',
           ],
           'defines': [
             'VERSION=<(version_full)',
           ],
@@ skipping 264 matching lines @@
         }],
       ],
       'targets': [
         {
           'target_name': 'remoting_me2me_host',
           'type': 'executable',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
-            '../media/media.gyp:media',
             '../net/net.gyp:net',
+            '../third_party/webrtc/modules/modules.gyp:desktop_capture',
             'remoting_base',
             'remoting_breakpad',
             'remoting_host',
             'remoting_host_event_logger',
             'remoting_host_logging',
             'remoting_jingle_glue',
             'remoting_me2me_host_static',
           ],
           'defines': [
             'VERSION=<(version_full)',
@@ skipping 565 matching lines @@
             'HOST_IMPLEMENTATION',
             'ISOLATION_AWARE_ENABLED=1',
             'STRICT',
             'VERSION=<(version_full)',
           ],
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_static',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../ipc/ipc.gyp:ipc',
-            '../media/media.gyp:media',
             '../net/net.gyp:net',
+            '../third_party/webrtc/modules/modules.gyp:desktop_capture',
             'remoting_base',
             'remoting_breakpad',
             'remoting_host',
             'remoting_host_event_logger',
             'remoting_host_logging',
             'remoting_lib_idl',
             'remoting_lib_ps',
             'remoting_lib_rc',
             'remoting_me2me_host_static',
             'remoting_protocol',
@@ skipping 493 matching lines @@
       'target_name': 'remoting_client_plugin',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'defines': [
         'HAVE_STDINT_H',  # Required by on2_integer.h
       ],
       'dependencies': [
         'remoting_base',
         'remoting_client',
         'remoting_jingle_glue',
-        '../media/media.gyp:media',
         '../net/net.gyp:net',
         '../ppapi/ppapi.gyp:ppapi_cpp_objects',
         '../skia/skia.gyp:skia',
+        '../third_party/webrtc/modules/modules.gyp:desktop_capture',
       ],
       'sources': [
         'client/plugin/chromoting_instance.cc',
         'client/plugin/chromoting_instance.h',
         'client/plugin/mac_key_event_processor.cc',
         'client/plugin/mac_key_event_processor.h',
         'client/plugin/pepper_audio_player.cc',
         'client/plugin/pepper_audio_player.h',
         'client/plugin/pepper_entrypoints.cc',
         'client/plugin/pepper_entrypoints.h',
@@ skipping 149 matching lines @@
             '<@(remoting_webapp_files)',
             '<@(remoting_webapp_js_files)',
             '--locales',
             '<@(remoting_webapp_locale_files)',
           ],
           'msvs_cygwin_shell': 1,
         },
       ],
       'target_conditions': [
         # We cannot currently build the appsv2 version of WebApp on Windows as
-        # there isn't a version of the "patch" tool available on windows. We 
+        # there isn't a version of the "patch" tool available on windows. We
         # should remove this condition when we remove the reliance on the 'patch'.
 
         # We define this in a 'target_conditions' section because 'plugin_path'
         # is defined in a 'conditions' section so its value is not available
         # when gyp processes the 'actions' in a 'conditions" section.
         ['OS != "win"', {
           'actions': [
             {
               'action_name': 'Build Remoting WebApp V2',
               'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
@@ skipping 27 matching lines @@
                 '<(_output_dir)',
                 '<(_zip_path)',
                 '<(plugin_path)',
                 '<@(remoting_webapp_apps_v2_js_files)',
                 '<@(remoting_webapp_files)',
                 '<@(remoting_webapp_js_files)',
                 '--locales',
                 '<@(remoting_webapp_locale_files)',
                 '--patches',
                 '<@(remoting_webapp_patch_files)',
-              ],    
+              ],
               'msvs_cygwin_shell': 1,
             },
           ],
         }],
       ],
     }, # end of target 'remoting_webapp'
 
     {
       'target_name': 'remoting_resources',
       'type': 'none',
@@ skipping 407 matching lines @@
 
     # Remoting unit tests
     {
       'target_name': 'remoting_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../ipc/ipc.gyp:ipc',
-        '../media/media.gyp:media',
-        '../media/media.gyp:media_test_support',
         '../net/net.gyp:net_test_support',
         '../ppapi/ppapi.gyp:ppapi_cpp',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/ui.gyp:ui',
         'remoting_base',
         'remoting_breakpad',
         'remoting_client',
         'remoting_client_plugin',
         'remoting_host',
@@ skipping 64 matching lines @@
         'host/log_to_server_unittest.cc',
         'host/pin_hash_unittest.cc',
         'host/policy_hack/fake_policy_watcher.cc',
         'host/policy_hack/fake_policy_watcher.h',
         'host/policy_hack/mock_policy_callback.cc',
         'host/policy_hack/mock_policy_callback.h',
         'host/policy_hack/policy_watcher_unittest.cc',
         'host/register_support_host_request_unittest.cc',
         'host/remote_input_filter_unittest.cc',
         'host/resizing_host_observer_unittest.cc',
+        'host/screen_capturer_fake.cc',
+        'host/screen_capturer_fake.h',
         'host/screen_resolution_unittest.cc',
         'host/server_log_entry_unittest.cc',
         'host/setup/native_messaging_host_unittest.cc',
         'host/setup/native_messaging_reader_unittest.cc',
         'host/setup/native_messaging_writer_unittest.cc',
         'host/setup/oauth_helper_unittest.cc',
         'host/setup/pin_validator_unittest.cc',
         'host/token_validator_factory_impl_unittest.cc',
         'host/video_scheduler_unittest.cc',
         'host/win/message_window_unittest.cc',
@@ skipping 111 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],  # end of 'toolkit_uses_gtk == 1'
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }