Reland of Unify the macOS and iOS capturer implementations

webrtc/modules/video_capture/BUILD.gn

Index: webrtc/modules/video_capture/BUILD.gn
diff --git a/webrtc/modules/video_capture/BUILD.gn b/webrtc/modules/video_capture/BUILD.gn
index 60573ba4b1c359c9c8f629a052eae2d2280b1c27..cd4d3c91b88bd1e4b3036424edb33d506b1a7796 100644
--- a/webrtc/modules/video_capture/BUILD.gn
+++ b/webrtc/modules/video_capture/BUILD.gn
@@ -60,7 +60,7 @@ rtc_static_library("video_capture") {
 
 if (!build_with_chromium) {
   config("video_capture_internal_impl_config") {
-    if (is_ios) {
+    if (is_ios || is_mac) {
       libs = [
         "AVFoundation.framework",
         "CoreMedia.framework",
@@ -104,30 +104,6 @@ if (!build_with_chromium) {
       ]
       deps += [ "../..:webrtc_common" ]
     }
-    if (is_mac) {
-      sources = [
-        "mac/qtkit/video_capture_qtkit.h",
-        "mac/qtkit/video_capture_qtkit.mm",
-        "mac/qtkit/video_capture_qtkit_info.h",
-        "mac/qtkit/video_capture_qtkit_info.mm",
-        "mac/qtkit/video_capture_qtkit_info_objc.h",
-        "mac/qtkit/video_capture_qtkit_info_objc.mm",
-        "mac/qtkit/video_capture_qtkit_objc.h",
-        "mac/qtkit/video_capture_qtkit_objc.mm",
-        "mac/qtkit/video_capture_qtkit_utility.h",
-        "mac/video_capture_mac.mm",
-      ]
-
-      libs = [
-        # For NSAlert in video_capture_qtkit_info_objc.mm.
-        "Cocoa.framework",
-
-        # For GetGestalt in video_capture_mac.mm.
-        "CoreServices.framework",
-        "CoreVideo.framework",
-        "QTKit.framework",
-      ]
-    }
     if (is_win) {
       sources = [
         "windows/device_info_ds.cc",
@@ -149,16 +125,16 @@ if (!build_with_chromium) {
 
       deps += [ "//third_party/winsdk_samples" ]
     }
-    if (is_ios) {
+    if (is_ios || is_mac) {
       sources = [
-        "ios/device_info_ios.h",
-        "ios/device_info_ios.mm",
-        "ios/device_info_ios_objc.h",
-        "ios/device_info_ios_objc.mm",
-        "ios/rtc_video_capture_ios_objc.h",
-        "ios/rtc_video_capture_ios_objc.mm",
-        "ios/video_capture_ios.h",
-        "ios/video_capture_ios.mm",
+        "objc/device_info.h",
+        "objc/device_info.mm",
+        "objc/device_info_objc.h",
+        "objc/device_info_objc.mm",
+        "objc/rtc_video_capture_objc.h",
+        "objc/rtc_video_capture_objc.mm",
+        "objc/video_capture.h",
+        "objc/video_capture.mm",
       ]
 
       cflags = [
@@ -183,7 +159,6 @@ if (!build_with_chromium) {
   if (!is_android && rtc_include_tests) {
     rtc_test("video_capture_tests") {
       sources = [
-        "test/video_capture_main_mac.mm",
         "test/video_capture_unittest.cc",
       ]
 
@@ -215,11 +190,7 @@ if (!build_with_chromium) {
         "../utility",
         "//testing/gtest",
       ]
-      if (is_mac) {
-        deps += [ "//webrtc/test:test_support_main_threaded_mac" ]
-      } else {
-        deps += [ "//webrtc/test:test_support_main" ]
-      }
+      deps += [ "//webrtc/test:test_support_main" ]
 
       if (is_clang) {
         # Suppress warnings from Chrome's Clang plugins.