From 38e145f33d844e077b09e1fb119fae9d5d7bbc3e Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Mon, 10 Jul 2023 18:51:33 -0400
Subject: [PATCH] 4669995: Remove CFToNSCast and NSToCFCast

https://chromium-review.googlesource.com/c/chromium/src/+/4669995
---
 shell/common/application_info_mac.mm | 4 +++-
 shell/common/platform_util_mac.mm    | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/shell/common/application_info_mac.mm b/shell/common/application_info_mac.mm
index bbf5e47178..c9ffbef889 100644
--- a/shell/common/application_info_mac.mm
+++ b/shell/common/application_info_mac.mm
@@ -20,7 +20,9 @@ std::string ApplicationInfoDictionaryValue(NSString* key) {
 }
 
 std::string ApplicationInfoDictionaryValue(CFStringRef key) {
-  return ApplicationInfoDictionaryValue(base::mac::CFToNSCast(key));
+  NSString* key_ns =
+      const_cast<NSString*>(reinterpret_cast<const NSString*>(key));
+  return ApplicationInfoDictionaryValue(key_ns);
 }
 
 }  // namespace
diff --git a/shell/common/platform_util_mac.mm b/shell/common/platform_util_mac.mm
index e272d7ca33..d4ded68576 100644
--- a/shell/common/platform_util_mac.mm
+++ b/shell/common/platform_util_mac.mm
@@ -30,8 +30,9 @@ namespace {
 // thread safe, including LSGetApplicationForURL (> 10.2) and
 // NSWorkspace#openURLs.
 std::string OpenURL(NSURL* ns_url, bool activate) {
-  CFURLRef ref = LSCopyDefaultApplicationURLForURL(
-      base::mac::NSToCFCast(ns_url), kLSRolesAll, nullptr);
+  CFURLRef cf_url = reinterpret_cast<CFURLRef>(ns_url);
+  CFURLRef ref =
+      LSCopyDefaultApplicationURLForURL(cf_url, kLSRolesAll, nullptr);
 
   // If no application could be found, NULL is returned and outError
   // (if not NULL) is populated with kLSApplicationNotFoundErr.