chore: cleanup arc migration helpers (#39606)

BUILD.gn

@@ -543,7 +543,6 @@ source_set("electron_lib") {
 
   if (is_mac) {
     deps += [
-      ":electron_lib_arc",
       "//components/remote_cocoa/app_shim",
       "//components/remote_cocoa/browser",
       "//content/browser:mac_helpers",
@@ -745,62 +744,6 @@ source_set("electron_lib") {
   }
 }
 
-if (is_mac) {
-  source_set("electron_lib_arc") {
-    public_configs = [ ":branding" ]
-    include_dirs = [ "." ]
-    sources = [
-      "shell/app/electron_main_delegate_mac.h",
-      "shell/app/electron_main_delegate_mac.mm",
-      "shell/browser/api/electron_api_menu_mac.h",
-      "shell/browser/api/electron_api_menu_mac.mm",
-      "shell/browser/api/electron_api_native_theme_mac.mm",
-      "shell/browser/api/electron_api_push_notifications_mac.mm",
-      "shell/browser/api/electron_api_system_preferences_mac.mm",
-      "shell/browser/browser_mac.mm",
-      "shell/browser/electron_browser_main_parts_mac.mm",
-      "shell/browser/mac/dict_util.h",
-      "shell/browser/mac/dict_util.mm",
-      "shell/browser/mac/electron_application.h",
-      "shell/browser/mac/electron_application.mm",
-      "shell/browser/mac/electron_application_delegate.h",
-      "shell/browser/mac/electron_application_delegate.mm",
-      "shell/browser/native_window_mac.h",
-      "shell/browser/native_window_mac.mm",
-      "shell/browser/ui/cocoa/delayed_native_view_host.h",
-      "shell/browser/ui/cocoa/delayed_native_view_host.mm",
-      "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h",
-      "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm",
-      "shell/browser/ui/cocoa/electron_menu_controller.mm",
-      "shell/browser/ui/cocoa/electron_ns_window.h",
-      "shell/browser/ui/cocoa/electron_ns_window.mm",
-      "shell/browser/ui/cocoa/electron_ns_window_delegate.h",
-      "shell/browser/ui/cocoa/electron_ns_window_delegate.mm",
-      "shell/browser/ui/cocoa/electron_touch_bar.h",
-      "shell/browser/ui/cocoa/electron_touch_bar.mm",
-      "shell/browser/ui/inspectable_web_contents_view_mac.h",
-      "shell/browser/ui/inspectable_web_contents_view_mac.mm",
-      "shell/browser/ui/tray_icon_cocoa.h",
-      "shell/browser/ui/tray_icon_cocoa.mm",
-    ]
-
-    deps = [
-      "buildflags",
-      "shell/common/api:mojo",
-      "//base",
-      "//skia",
-      "//third_party/electron_node:node_lib",
-      "//third_party/webrtc_overrides:webrtc_component",
-      "//v8",
-    ]
-
-    configs += [
-      "//electron/build/config:mas_build",
-      "//third_party/electron_node:node_internals",
-    ]
-  }
-}
-
 electron_paks("packed_resources") {
   if (is_mac) {
     output_dir = "$root_gen_dir/electron_repack"

chromium_src/BUILD.gn

@@ -213,7 +213,20 @@ static_library("chrome") {
   }
 
   if (is_mac) {
-    public_deps += [ ":chrome_lib_arc" ]
+    sources += [
+      "//chrome/browser/extensions/global_shortcut_listener_mac.h",
+      "//chrome/browser/extensions/global_shortcut_listener_mac.mm",
+      "//chrome/browser/icon_loader_mac.mm",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm",
+      "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
+      "//chrome/browser/platform_util_mac.mm",
+      "//chrome/browser/process_singleton_mac.mm",
+      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
+      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm",
+    ]
   }
 
   if (enable_widevine) {
@@ -329,34 +342,6 @@ static_library("chrome") {
   }
 }
 
-if (is_mac) {
-  source_set("chrome_lib_arc") {
-    include_dirs = [ "." ]
-    sources = [
-      "//chrome/browser/extensions/global_shortcut_listener_mac.h",
-      "//chrome/browser/extensions/global_shortcut_listener_mac.mm",
-      "//chrome/browser/icon_loader_mac.mm",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm",
-      "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
-      "//chrome/browser/platform_util_mac.mm",
-      "//chrome/browser/process_singleton_mac.mm",
-      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
-      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm",
-    ]
-
-    deps = [
-      "//base",
-      "//skia",
-      "//third_party/electron_node:node_lib",
-      "//third_party/webrtc_overrides:webrtc_component",
-      "//v8",
-    ]
-  }
-}
-
 source_set("plugins") {
   sources = []
   deps = []

filenames.gni

@@ -116,10 +116,25 @@ filenames = {
   ]
 
   lib_sources_mac = [
+    "shell/app/electron_main_delegate_mac.h",
+    "shell/app/electron_main_delegate_mac.mm",
     "shell/browser/api/electron_api_app_mac.mm",
+    "shell/browser/api/electron_api_menu_mac.h",
+    "shell/browser/api/electron_api_menu_mac.mm",
+    "shell/browser/api/electron_api_native_theme_mac.mm",
     "shell/browser/api/electron_api_power_monitor_mac.mm",
+    "shell/browser/api/electron_api_push_notifications_mac.mm",
+    "shell/browser/api/electron_api_system_preferences_mac.mm",
     "shell/browser/api/electron_api_web_contents_mac.mm",
     "shell/browser/auto_updater_mac.mm",
+    "shell/browser/browser_mac.mm",
+    "shell/browser/electron_browser_main_parts_mac.mm",
+    "shell/browser/mac/dict_util.h",
+    "shell/browser/mac/dict_util.mm",
+    "shell/browser/mac/electron_application.h",
+    "shell/browser/mac/electron_application.mm",
+    "shell/browser/mac/electron_application_delegate.h",
+    "shell/browser/mac/electron_application_delegate.mm",
     "shell/browser/mac/in_app_purchase_observer.h",
     "shell/browser/mac/in_app_purchase_observer.mm",
     "shell/browser/mac/in_app_purchase_product.h",
@@ -128,6 +143,8 @@ filenames = {
     "shell/browser/mac/in_app_purchase.mm",
     "shell/browser/native_browser_view_mac.h",
     "shell/browser/native_browser_view_mac.mm",
+    "shell/browser/native_window_mac.h",
+    "shell/browser/native_window_mac.mm",
     "shell/browser/notifications/mac/cocoa_notification.h",
     "shell/browser/notifications/mac/cocoa_notification.mm",
     "shell/browser/notifications/mac/notification_center_delegate.h",
@@ -138,15 +155,26 @@ filenames = {
     "shell/browser/osr/osr_web_contents_view_mac.mm",
     "shell/browser/relauncher_mac.cc",
     "shell/browser/ui/certificate_trust_mac.mm",
+    "shell/browser/ui/cocoa/delayed_native_view_host.h",
+    "shell/browser/ui/cocoa/delayed_native_view_host.mm",
     "shell/browser/ui/cocoa/electron_bundle_mover.h",
     "shell/browser/ui/cocoa/electron_bundle_mover.mm",
+    "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h",
+    "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm",
     "shell/browser/ui/cocoa/electron_menu_controller.h",
+    "shell/browser/ui/cocoa/electron_menu_controller.mm",
     "shell/browser/ui/cocoa/electron_native_widget_mac.h",
     "shell/browser/ui/cocoa/electron_native_widget_mac.mm",
     "shell/browser/ui/cocoa/electron_ns_panel.h",
     "shell/browser/ui/cocoa/electron_ns_panel.mm",
+    "shell/browser/ui/cocoa/electron_ns_window.h",
+    "shell/browser/ui/cocoa/electron_ns_window.mm",
+    "shell/browser/ui/cocoa/electron_ns_window_delegate.h",
+    "shell/browser/ui/cocoa/electron_ns_window_delegate.mm",
     "shell/browser/ui/cocoa/electron_preview_item.h",
     "shell/browser/ui/cocoa/electron_preview_item.mm",
+    "shell/browser/ui/cocoa/electron_touch_bar.h",
+    "shell/browser/ui/cocoa/electron_touch_bar.mm",
     "shell/browser/ui/cocoa/event_dispatching_window.h",
     "shell/browser/ui/cocoa/event_dispatching_window.mm",
     "shell/browser/ui/cocoa/NSString+ANSI.h",
@@ -159,7 +187,11 @@ filenames = {
     "shell/browser/ui/cocoa/window_buttons_proxy.mm",
     "shell/browser/ui/drag_util_mac.mm",
     "shell/browser/ui/file_dialog_mac.mm",
+    "shell/browser/ui/inspectable_web_contents_view_mac.h",
+    "shell/browser/ui/inspectable_web_contents_view_mac.mm",
     "shell/browser/ui/message_box_mac.mm",
+    "shell/browser/ui/tray_icon_cocoa.h",
+    "shell/browser/ui/tray_icon_cocoa.mm",
     "shell/common/api/electron_api_clipboard_mac.mm",
     "shell/common/api/electron_api_native_image_mac.mm",
     "shell/common/asar/archive_mac.mm",

shell/app/electron_main_delegate_mac.mm

@@ -18,10 +18,6 @@
 #include "shell/common/application_info.h"
 #include "shell/common/mac/main_application_bundle.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace electron {
 
 namespace {

shell/browser/api/electron_api_menu_mac.h

@@ -11,10 +11,6 @@
 
 #import "shell/browser/ui/cocoa/electron_menu_controller.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace electron::api {
 
 class MenuMac : public Menu {

shell/browser/api/electron_api_native_theme_mac.mm

@@ -6,10 +6,6 @@
 
 #include "shell/browser/mac/electron_application.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace electron::api {
 
 void NativeTheme::UpdateMacOSAppearanceForOverrideValue(

shell/browser/api/electron_api_push_notifications_mac.mm

@@ -12,10 +12,6 @@
 #include "shell/common/gin_converters/value_converter.h"
 #include "shell/common/gin_helper/promise.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace electron::api {
 
 v8::Local<v8::Promise> PushNotifications::RegisterForAPNSNotifications(

shell/browser/api/electron_api_system_preferences_mac.mm

@@ -30,10 +30,6 @@
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/native_theme/native_theme.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace gin {
 
 template <>

shell/browser/browser_mac.mm

@@ -36,10 +36,6 @@
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace electron {
 
 namespace {

shell/browser/electron_browser_main_parts_mac.mm

@@ -12,15 +12,11 @@
 #include "services/device/public/cpp/geolocation/geolocation_manager.h"
 #include "services/device/public/cpp/geolocation/system_geolocation_source_mac.h"
 #include "shell/browser/browser_process_impl.h"
-#import "shell/browser/mac/electron_application.h"
+#include "shell/browser/mac/electron_application.h"
 #include "shell/browser/mac/electron_application_delegate.h"
 #include "shell/common/electron_paths.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace electron {
 
 static ElectronApplicationDelegate* __strong delegate_;

shell/browser/mac/dict_util.mm

@@ -10,10 +10,6 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace electron {
 
 NSArray* ListValueToNSArray(const base::Value::List& value) {

shell/browser/mac/electron_application.h

@@ -11,10 +11,6 @@
 #import <AVFoundation/AVFoundation.h>
 #import <LocalAuthentication/LocalAuthentication.h>
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 @interface AtomApplication : NSApplication <CrAppProtocol,
                                             CrAppControlProtocol,
                                             NSUserActivityDelegate> {

shell/browser/mac/electron_application_delegate.mm

@@ -19,10 +19,6 @@
 
 #import <UserNotifications/UserNotifications.h>
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 static NSDictionary* UNNotificationResponseToNSDictionary(
     UNNotificationResponse* response) {
   if (![response respondsToSelector:@selector(actionIdentifier)] ||

shell/browser/native_window_mac.mm

@@ -52,10 +52,6 @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/native_frame_view_mac.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 @interface ElectronProgressBar : NSProgressIndicator
 @end
 

shell/browser/ui/cocoa/delayed_native_view_host.mm

@@ -6,10 +6,6 @@
 #include "base/apple/owned_objc.h"
 #include "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace electron {
 
 DelayedNativeViewHost::DelayedNativeViewHost(gfx::NativeView native_view)

shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h

@@ -12,10 +12,6 @@
 #include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
 #include "ui/base/cocoa/base_view.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace electron {
 class InspectableWebContentsViewMac;
 }

shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm

@@ -13,10 +13,6 @@
 #include "ui/base/cocoa/base_view.h"
 #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 @implementation ElectronInspectableWebContentsView
 
 - (instancetype)initWithInspectableWebContentsViewMac:

shell/browser/ui/cocoa/electron_menu_controller.h

@@ -11,10 +11,6 @@
 #include "base/functional/callback.h"
 #include "base/memory/weak_ptr.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace electron {
 class ElectronMenuModel;
 }

shell/browser/ui/cocoa/electron_ns_window.mm

@@ -14,10 +14,6 @@
 #import <objc/message.h>
 #import <objc/runtime.h>
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace electron {
 
 int ScopedDisableResize::disable_resize_ = 0;

shell/browser/ui/cocoa/electron_ns_window_delegate.mm

@@ -17,10 +17,6 @@
 #include "ui/views/cocoa/native_widget_mac_ns_window_host.h"
 #include "ui/views/widget/native_widget_mac.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 using TitleBarStyle = electron::NativeWindowMac::TitleBarStyle;
 using FullScreenTransitionState =
     electron::NativeWindow::FullScreenTransitionState;

shell/browser/ui/cocoa/electron_touch_bar.h

@@ -15,10 +15,6 @@
 #include "shell/browser/native_window.h"
 #include "shell/common/gin_helper/persistent_dictionary.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 @interface ElectronTouchBar : NSObject <NSScrubberDelegate,
                                         NSScrubberDataSource,
                                         NSScrubberFlowLayoutDelegate> {

shell/browser/ui/inspectable_web_contents_view_mac.h

@@ -10,10 +10,6 @@
 
 @class ElectronInspectableWebContentsView;
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace electron {
 
 class InspectableWebContentsViewMac : public InspectableWebContentsView {

shell/browser/ui/tray_icon_cocoa.h

@@ -14,10 +14,6 @@
 @class ElectronMenuController;
 @class StatusItemView;
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace electron {
 
 class TrayIconCocoa : public TrayIcon {

shell/common/application_info_mac.mm

@@ -2,13 +2,13 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#import "shell/common/application_info.h"
+#include "shell/common/application_info.h"
 
 #include <string>
 
-#import "base/mac/foundation_util.h"
-#import "base/strings/sys_string_conversions.h"
-#import "shell/common/mac/main_application_bundle.h"
+#include "base/mac/foundation_util.h"
+#include "base/strings/sys_string_conversions.h"
+#include "shell/common/mac/main_application_bundle.h"
 
 namespace electron {
 

shell/common/mac/main_application_bundle.mm

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#import "shell/common/mac/main_application_bundle.h"
+#include "shell/common/mac/main_application_bundle.h"
 
 #include "base/apple/bundle_locations.h"
 #include "base/files/file_path.h"