Reland of Unify the macOS and iOS capturer implementations

webrtc/modules/video_capture/objc/video_capture.mm

Index: webrtc/modules/video_capture/objc/video_capture.mm
diff --git a/webrtc/modules/video_capture/ios/video_capture_ios.mm b/webrtc/modules/video_capture/objc/video_capture.mm
similarity index 86%
rename from webrtc/modules/video_capture/ios/video_capture_ios.mm
rename to webrtc/modules/video_capture/objc/video_capture.mm
index 7a1f17bd13f75290a4439f26a2a331e843bfe298..e73b47ae0e2cbb1e9db6997687584e56f844df5e 100644
--- a/webrtc/modules/video_capture/ios/video_capture_ios.mm
+++ b/webrtc/modules/video_capture/objc/video_capture.mm
@@ -14,8 +14,8 @@
 
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/modules/video_capture/ios/device_info_ios_objc.h"
-#include "webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h"
+#include "webrtc/modules/video_capture/objc/device_info_objc.h"
+#include "webrtc/modules/video_capture/objc/rtc_video_capture_objc.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
 using namespace webrtc;
@@ -67,9 +67,10 @@ rtc::scoped_refptr<VideoCaptureModule> VideoCaptureIos::Create(
     return nullptr;
   }
 
-  if (![capture_module->capture_device_ setCaptureDeviceByUniqueId:[
-              [NSString alloc] initWithCString:deviceUniqueIdUTF8
-                                      encoding:NSUTF8StringEncoding]]) {
+  if (![capture_module->capture_device_
+          setCaptureDeviceByUniqueId:
+              [[NSString alloc] initWithCString:deviceUniqueIdUTF8
+                                       encoding:NSUTF8StringEncoding]]) {
     return nullptr;
   }
   return capture_module;
@@ -97,7 +98,9 @@ int32_t VideoCaptureIos::StopCapture() {
   return 0;
 }
 
-bool VideoCaptureIos::CaptureStarted() { return is_capturing_; }
+bool VideoCaptureIos::CaptureStarted() {
+  return is_capturing_;
+}
 
 int32_t VideoCaptureIos::CaptureSettings(VideoCaptureCapability& settings) {
   settings = capability_;