Reland of Unify the macOS and iOS capturer implementations

webrtc/modules/video_capture/objc/device_info.h

Index: webrtc/modules/video_capture/objc/device_info.h
diff --git a/webrtc/modules/video_capture/ios/device_info_ios.h b/webrtc/modules/video_capture/objc/device_info.h
similarity index 91%
rename from webrtc/modules/video_capture/ios/device_info_ios.h
rename to webrtc/modules/video_capture/objc/device_info.h
index 6af7c338995ee88d5fcf22c1f692143d3e9c97c5..bec5c694baf5192a0bc7093f4f00254f36b1a668 100644
--- a/webrtc/modules/video_capture/ios/device_info_ios.h
+++ b/webrtc/modules/video_capture/objc/device_info.h
@@ -8,12 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_IOS_DEVICE_INFO_IOS_H_
-#define WEBRTC_MODULES_VIDEO_CAPTURE_IOS_DEVICE_INFO_IOS_H_
+#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_DEVICE_INFO_H_
+#define WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_DEVICE_INFO_H_
 
 #include "webrtc/modules/video_capture/device_info_impl.h"
 
 #include <map>
+#include <string>
 
 namespace webrtc {
 namespace videocapturemodule {
@@ -57,4 +58,4 @@ class DeviceInfoIos : public DeviceInfoImpl {
 }  // namespace videocapturemodule
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_VIDEO_CAPTURE_IOS_DEVICE_INFO_IOS_H_
+#endif  // WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_DEVICE_INFO_H_