WebContentsVideoCapture Cleanup: Gut-out dead code, and tighten BUILDs.

content/browser/BUILD.gn

Index: content/browser/BUILD.gn
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 4d681cc125a7543fbf8d75079320386d1ef5dffb..3e785627800948e22b6788162f41ef641ee77a8b 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -865,11 +865,6 @@ source_set("browser") {
     "media/audio_stream_monitor.h",
     "media/capture/audio_mirroring_manager.cc",
     "media/capture/audio_mirroring_manager.h",
-    "media/capture/cursor_renderer.h",
-    "media/capture/cursor_renderer_aura.cc",
-    "media/capture/cursor_renderer_aura.h",
-    "media/capture/cursor_renderer_mac.h",
-    "media/capture/cursor_renderer_mac.mm",
     "media/capture/desktop_capture_device_uma_types.cc",
     "media/capture/desktop_capture_device_uma_types.h",
     "media/capture/image_capture_impl.cc",
@@ -880,14 +875,6 @@ source_set("browser") {
     "media/capture/web_contents_audio_muter.h",
     "media/capture/web_contents_tracker.cc",
     "media/capture/web_contents_tracker.h",
-    "media/capture/web_contents_video_capture_device.cc",
-    "media/capture/web_contents_video_capture_device.h",
-    "media/capture/window_activity_tracker.cc",
-    "media/capture/window_activity_tracker.h",
-    "media/capture/window_activity_tracker_aura.cc",
-    "media/capture/window_activity_tracker_aura.h",
-    "media/capture/window_activity_tracker_mac.h",
-    "media/capture/window_activity_tracker_mac.mm",
     "media/cdm_registry_impl.cc",
     "media/cdm_registry_impl.h",
     "media/media_devices_permission_checker.cc",
@@ -1508,26 +1495,48 @@ source_set("browser") {
       "//third_party/webrtc/media:rtc_media_base",
       "//third_party/webrtc/modules/desktop_capture:primitives",
     ]
-    if (!is_ios) {
-      defines += [ "ENABLE_SCREEN_CAPTURE=1" ]
-    }
+
     if (is_linux || is_mac || is_win) {
       sources += [
         "media/capture/desktop_capture_device.cc",
         "media/capture/desktop_capture_device.h",
       ]
-      if (use_aura) {
-        sources += [
-          "media/capture/aura_window_capture_machine.cc",
-          "media/capture/aura_window_capture_machine.h",
-          "media/capture/desktop_capture_device_aura.cc",
-          "media/capture/desktop_capture_device_aura.h",
-        ]
-      }
       deps += [ "//third_party/webrtc/modules/desktop_capture" ]
     }
   }
 
+  # Desktop screen capture implementations that are not dependent on WebRTC.
+  if (is_linux || is_mac || is_win) {
+    defines += [ "ENABLE_SCREEN_CAPTURE=1" ]
+    sources += [
+      "media/capture/cursor_renderer.h",
+      "media/capture/web_contents_video_capture_device.cc",
+      "media/capture/web_contents_video_capture_device.h",
+      "media/capture/window_activity_tracker.cc",
+      "media/capture/window_activity_tracker.h",
+    ]
+    if (use_aura) {
+      sources += [
+        "media/capture/aura_window_capture_machine.cc",
+        "media/capture/aura_window_capture_machine.h",
+        "media/capture/cursor_renderer_aura.cc",
+        "media/capture/cursor_renderer_aura.h",
+        "media/capture/desktop_capture_device_aura.cc",
+        "media/capture/desktop_capture_device_aura.h",
+        "media/capture/window_activity_tracker_aura.cc",
+        "media/capture/window_activity_tracker_aura.h",
+      ]
+    }
+    if (is_mac) {
+      sources += [
+        "media/capture/cursor_renderer_mac.h",
+        "media/capture/cursor_renderer_mac.mm",
+        "media/capture/window_activity_tracker_mac.h",
+        "media/capture/window_activity_tracker_mac.mm",
+      ]
+    }
+  }
+
   if (is_win) {
     sources -= [ "device_sensors/data_fetcher_shared_memory_default.cc" ]
     defines += [
@@ -1786,7 +1795,10 @@ source_set("browser") {
       "//mojo/android:libsystem_java",
       "//ui/android",
     ]
-    defines += [ "APPCACHE_USE_SIMPLE_CACHE" ]
+    defines += [
+      "APPCACHE_USE_SIMPLE_CACHE",
+      "ENABLE_SCREEN_CAPTURE=1",
+    ]
     libs += [ "jnigraphics" ]
   } else {
     # Not Android.
@@ -1859,10 +1871,6 @@ source_set("browser") {
     ]
   } else {  # Not aura.
     sources -= [
-      "media/capture/cursor_renderer_aura.cc",
-      "media/capture/cursor_renderer_aura.h",
-      "media/capture/window_activity_tracker_aura.cc",
-      "media/capture/window_activity_tracker_aura.h",
       "renderer_host/compositor_resize_lock_aura.cc",
       "renderer_host/compositor_resize_lock_aura.h",
       "renderer_host/input/synthetic_gesture_target_aura.cc",