Revert of Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer

webrtc/modules/BUILD.gn

 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import("../build/webrtc.gni")
 import("audio_coding/audio_coding.gni")
-import("desktop_capture/desktop_capture.gni")
 
 declare_args() {
   # Desktop capturer is supported only on Windows, OSX and Linux.
-  rtc_desktop_capture_supported = rtc_desktop_capture_supported
+  rtc_desktop_capture_supported = is_win || is_mac || is_linux
 }
 
 group("modules") {
   public_deps = [
     "audio_coding",
     "audio_conference_mixer",
     "audio_device",
     "audio_mixer",
     "audio_processing",
     "bitrate_controller",
@@ skipping 70 matching lines @@
       "audio_coding/test/iSACTest.cc",
       "audio_coding/test/opus_test.cc",
       "audio_coding/test/target_delay_unittest.cc",
       "audio_coding/test/utility.cc",
       "rtp_rtcp/test/testFec/test_fec.cc",
       "video_coding/codecs/test/videoprocessor_integrationtest.cc",
       "video_coding/codecs/vp8/test/vp8_impl_unittest.cc",
     ]
 
     if (rtc_desktop_capture_supported) {
-      deps += [ "desktop_capture:screen_drawer" ]
-      sources += [
-        "desktop_capture/screen_capturer_integration_test.cc",
-        "desktop_capture/screen_drawer_unittest.cc",
-      ]
+      deps += [ "desktop_capture:desktop_capture_test_tools" ]
+      sources += [ "desktop_capture/screen_capturer_integration_test.cc" ]
     }
 
     data = modules_tests_resources
 
     if (is_android) {
       deps += [ "//testing/android/native_test:native_test_native_code" ]
       shard_timeout = 900
     }
 
     if (is_ios) {
@@ skipping 420 matching lines @@
 
     if (rtc_desktop_capture_supported || is_android) {
       deps += [ "desktop_capture" ]
       sources += [
         "desktop_capture/desktop_region_unittest.cc",
         "desktop_capture/differ_block_unittest.cc",
       ]
     }
 
     if (rtc_desktop_capture_supported) {
-      deps += [ "desktop_capture:desktop_capture_mock" ]
+      deps += [ "desktop_capture:desktop_capture_test_tools" ]
       sources += [
         "desktop_capture/desktop_and_cursor_composer_unittest.cc",
-        "desktop_capture/desktop_capturer_differ_wrapper_unittest.cc",
+        "desktop_capture/desktop_frame_generator.cc",
+        "desktop_capture/desktop_frame_generator.h",
+        "desktop_capture/fake_desktop_capturer.h",
+        "desktop_capture/fake_screen_capturer.cc",
+        "desktop_capture/fake_screen_capturer.h",
         "desktop_capture/mouse_cursor_monitor_unittest.cc",
         "desktop_capture/rgba_color_unittest.cc",
         "desktop_capture/screen_capturer_differ_wrapper_unittest.cc",
         "desktop_capture/screen_capturer_helper_unittest.cc",
         "desktop_capture/screen_capturer_mac_unittest.cc",
         "desktop_capture/screen_capturer_mock_objects.h",
         "desktop_capture/screen_capturer_unittest.cc",
+        "desktop_capture/screen_drawer_unittest.cc",
         "desktop_capture/win/cursor_unittest.cc",
         "desktop_capture/win/cursor_unittest_resources.h",
         "desktop_capture/win/cursor_unittest_resources.rc",
         "desktop_capture/window_capturer_unittest.cc",
       ]
     }
 
     if (rtc_prefer_fixed_point) {
       defines += [ "WEBRTC_AUDIOPROC_FIXED_PROFILE" ]
     } else {
@@ skipping 169 matching lines @@
       "../test:test_common",
       "../test:test_support_main",
       "remote_bitrate_estimator:bwe_simulator_lib",
       "video_capture",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/gflags",
     ]
   }
 }