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

webrtc/modules/desktop_capture/BUILD.gn

 # Copyright (c) 2014 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/config/ui.gni")
 import("../../build/webrtc.gni")
-import("desktop_capture.gni")
 
 use_desktop_capture_differ_sse2 =
     !is_ios && (current_cpu == "x86" || current_cpu == "x64")
 
 rtc_static_library("primitives") {
   sources = [
     "desktop_capture_types.h",
     "desktop_frame.cc",
     "desktop_frame.h",
     "desktop_geometry.cc",
     "desktop_geometry.h",
     "desktop_region.cc",
     "desktop_region.h",
     "shared_desktop_frame.cc",
     "shared_desktop_frame.h",
   ]
 
   deps = [
     "../../base:rtc_base",  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
   ]
 }
 
 if (rtc_include_tests) {
-  source_set("rgba_color") {
+  source_set("desktop_capture_test_tools") {
     testonly = true
 
     public_deps = [
       ":desktop_capture",
     ]
 
     sources = [
       "rgba_color.cc",
       "rgba_color.h",
-    ]
-  }
-
-  source_set("screen_drawer") {
-    testonly = true
-
-    public_deps = [
-      ":rgba_color",
-    ]
-
-    sources = [
       "screen_drawer.cc",
       "screen_drawer.h",
       "screen_drawer_linux.cc",
       "screen_drawer_mac.cc",
       "screen_drawer_win.cc",
     ]
   }
-
-  source_set("desktop_capture_mock") {
-    testonly = true
-
-    public_deps = [
-      ":desktop_capture",
-      ":rgba_color",
-    ]
-
-    sources = [
-      "desktop_frame_generator.cc",
-      "desktop_frame_generator.h",
-      "fake_desktop_capturer.h",
-      "fake_screen_capturer.cc",
-      "fake_screen_capturer.h",
-      "mock_desktop_capturer_callback.h",
-      "screen_capturer_mock_objects.h",
-    ]
-  }
 }
 
 rtc_static_library("desktop_capture") {
   sources = [
     "cropped_desktop_frame.cc",
     "cropped_desktop_frame.h",
     "cropping_window_capturer.cc",
     "cropping_window_capturer.h",
     "cropping_window_capturer_win.cc",
     "desktop_and_cursor_composer.cc",
@@ skipping 83 matching lines @@
   if (!is_win && !is_mac && !use_x11) {
     sources += [
       "mouse_cursor_monitor_null.cc",
       "screen_capturer_null.cc",
       "window_capturer_null.cc",
     ]
   }
 
   if (!is_ios) {
     sources += [
-      "desktop_capturer_differ_wrapper.cc",
-      "desktop_capturer_differ_wrapper.h",
       "differ_block.cc",
       "differ_block.h",
       "screen_capturer_differ_wrapper.cc",
       "screen_capturer_differ_wrapper.h",
     ]
   }
 
   if (is_mac) {
     libs = [
       "AppKit.framework",
@@ skipping 11 matching lines @@
 
   deps = [
     ":primitives",
     "../../base:rtc_base",  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
     "../../system_wrappers",
   ]
 
   if (use_desktop_capture_differ_sse2) {
     deps += [ ":desktop_capture_differ_sse2" ]
   }
-
-  if (rtc_desktop_capture_supported) {
-    defines = [ "RTC_DESKTOP_CAPTURE_SUPPORTED" ]
-  }
 }
 
 if (use_desktop_capture_differ_sse2) {
   # Have to be compiled as a separate target because it needs to be compiled
   # with SSE2 enabled.
   rtc_static_library("desktop_capture_differ_sse2") {
     visibility = [ ":*" ]
     sources = [
       "differ_vector_sse2.cc",
       "differ_vector_sse2.h",
     ]
 
     if (is_posix) {
       cflags = [ "-msse2" ]
     }
   }
 }