Move scoped_cftypreref to base/apple, leave a forwarding header

Crashpad is not yet updated for the new location, so leave a
forwarding header to be removed later.

Bug: 1444927
Change-Id: Ib00aa68980726f7702f740d543953abe397ffddc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4790741
Owners-Override: Avi Drissman <avi@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Commit-Queue: Mark Mentovai <mark@chromium.org>
Auto-Submit: Avi Drissman <avi@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1184758}

base/BUILD.gn

@@ -1960,6 +1960,7 @@ component("base") {
       "apple/owned_objc.h",
       "apple/owned_objc.mm",
       "apple/scoped_cffiledescriptorref.h",
+      "apple/scoped_cftyperef.h",
       "apple/scoped_dispatch_object.h",
       "apple/scoped_mach_port.cc",
       "apple/scoped_mach_port.h",
@@ -2025,7 +2026,6 @@ component("base") {
       "mac/scoped_aedesc.h",
       "mac/scoped_authorizationref.h",
       "mac/scoped_authorizationref.mm",
-      "mac/scoped_cftyperef.h",
       "mac/scoped_ionotificationportref.h",
       "mac/scoped_ioobject.h",
       "mac/scoped_ioplugininterface.h",

base/apple/backup_util_unittest.mm

@@ -7,11 +7,11 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/numerics/safe_conversions.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"

base/apple/bridging.h

@@ -8,9 +8,9 @@
 #include <CoreText/CoreText.h>
 #import <Foundation/Foundation.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/base_export.h"
 #include "base/check.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/types/always_false.h"
 #include "build/build_config.h"
 

base/apple/foundation_util_unittest.mm

@@ -9,9 +9,9 @@
 #include <limits.h>
 #include <stddef.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/format_macros.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"

base/apple/scoped_cftyperef.h

@@ -0,0 +1,48 @@
+// Copyright 2012 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef BASE_APPLE_SCOPED_CFTYPEREF_H_
+#define BASE_APPLE_SCOPED_CFTYPEREF_H_
+
+#include <CoreFoundation/CoreFoundation.h>
+
+#include "base/apple/scoped_typeref.h"
+
+namespace base {
+
+// ScopedCFTypeRef<> is patterned after std::unique_ptr<>, but maintains
+// ownership of a CoreFoundation object: any object that can be represented
+// as a CFTypeRef.  Style deviations here are solely for compatibility with
+// std::unique_ptr<>'s interface, with which everyone is already familiar.
+//
+// By default, ScopedCFTypeRef<> takes ownership of an object (in the
+// constructor or in reset()) by taking over the caller's existing ownership
+// claim.  The caller must own the object it gives to ScopedCFTypeRef<>, and
+// relinquishes an ownership claim to that object.  ScopedCFTypeRef<> does not
+// call CFRetain(). This behavior is parameterized by the |OwnershipPolicy|
+// enum. If the value |RETAIN| is passed (in the constructor or in reset()),
+// then ScopedCFTypeRef<> will call CFRetain() on the object, and the initial
+// ownership is not changed.
+
+namespace internal {
+
+template <typename CFT>
+struct ScopedCFTypeRefTraits {
+  static CFT InvalidValue() { return nullptr; }
+  static CFT Retain(CFT object) {
+    CFRetain(object);
+    return object;
+  }
+  static void Release(CFT object) { CFRelease(object); }
+};
+
+}  // namespace internal
+
+template <typename CFT>
+using ScopedCFTypeRef =
+    ScopedTypeRef<CFT, internal::ScopedCFTypeRefTraits<CFT>>;
+
+}  // namespace base
+
+#endif  // BASE_APPLE_SCOPED_CFTYPEREF_H_

base/files/file_path.cc

@@ -21,7 +21,7 @@
 #include "base/trace_event/base_tracing.h"
 
 #if BUILDFLAG(IS_APPLE)
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/third_party/icu/icu_utf.h"
 #endif
 

base/files/file_path_watcher_fsevents.cc

@@ -9,11 +9,11 @@
 #include <algorithm>
 #include <list>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/check.h"
 #include "base/files/file_util.h"
 #include "base/functional/bind.h"
 #include "base/lazy_instance.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/stringprintf.h"
 #include "base/task/sequenced_task_runner.h"
 #include "base/threading/scoped_blocking_call.h"

base/ios/device_util.mm

@@ -15,8 +15,8 @@
 
 #include <memory>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/check.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"

base/mac/foundation_util.h

@@ -12,9 +12,9 @@
 
 #include <string>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/base_export.h"
 #include "base/logging.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "build/build_config.h"
 
 #if defined(__OBJC__)

base/mac/mac_util.mm

@@ -18,11 +18,11 @@
 #include "base/apple/bridging.h"
 #include "base/apple/bundle_locations.h"
 #include "base/apple/osstatus_logging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_aedesc.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"

base/mac/mac_util_unittest.mm

@@ -10,11 +10,11 @@
 #include <stdint.h>
 #include <sys/xattr.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/system/sys_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"

base/mac/scoped_cftyperef.h

@@ -1,50 +1,16 @@
-// Copyright 2012 The Chromium Authors
+// Copyright 2023 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_MAC_SCOPED_CFTYPEREF_H_
 #define BASE_MAC_SCOPED_CFTYPEREF_H_
 
-#include <CoreFoundation/CoreFoundation.h>
+#include "base/apple/scoped_cftyperef.h"
 
-#include "base/apple/scoped_typeref.h"
+// This is a forwarding header so that Crashpad can continue to build correctly
+// until mini_chromium and then it are updated and rolled.
 
-namespace base {
-
-// ScopedCFTypeRef<> is patterned after std::unique_ptr<>, but maintains
-// ownership of a CoreFoundation object: any object that can be represented
-// as a CFTypeRef.  Style deviations here are solely for compatibility with
-// std::unique_ptr<>'s interface, with which everyone is already familiar.
-//
-// By default, ScopedCFTypeRef<> takes ownership of an object (in the
-// constructor or in reset()) by taking over the caller's existing ownership
-// claim.  The caller must own the object it gives to ScopedCFTypeRef<>, and
-// relinquishes an ownership claim to that object.  ScopedCFTypeRef<> does not
-// call CFRetain(). This behavior is parameterized by the |OwnershipPolicy|
-// enum. If the value |RETAIN| is passed (in the constructor or in reset()),
-// then ScopedCFTypeRef<> will call CFRetain() on the object, and the initial
-// ownership is not changed.
-
-namespace internal {
-
-template<typename CFT>
-struct ScopedCFTypeRefTraits {
-  static CFT InvalidValue() { return nullptr; }
-  static CFT Retain(CFT object) {
-    CFRetain(object);
-    return object;
-  }
-  static void Release(CFT object) {
-    CFRelease(object);
-  }
-};
-
-}  // namespace internal
-
-template<typename CFT>
-using ScopedCFTypeRef =
-    ScopedTypeRef<CFT, internal::ScopedCFTypeRefTraits<CFT>>;
-
-}  // namespace base
+// TODO(https://crbug.com/1444927): Update mini_chromium, update Crashpad, roll
+// Crashpad, and then delete this forwarding header.
 
 #endif  // BASE_MAC_SCOPED_CFTYPEREF_H_

base/message_loop/message_pump_apple.h

@@ -36,8 +36,8 @@
 
 #include <memory>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/containers/stack.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/memory/raw_ptr.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"

base/message_loop/message_pump_apple.mm

@@ -11,11 +11,11 @@
 #include <memory>
 
 #include "base/apple/call_with_eh_frame.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/apple/scoped_nsautorelease_pool.h"
 #include "base/auto_reset.h"
 #include "base/check_op.h"
 #include "base/feature_list.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/memory/raw_ptr.h"
 #include "base/memory/scoped_policy.h"
 #include "base/metrics/histogram_samples.h"

base/message_loop/message_pump_apple_unittest.mm

@@ -4,9 +4,9 @@
 
 #include "base/message_loop/message_pump_apple.h"
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/cancelable_callback.h"
 #include "base/functional/bind.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/task/current_thread.h"
 #include "base/task/single_thread_task_runner.h"
 #include "base/test/bind.h"

base/message_loop/message_pump_io_ios.h

@@ -6,8 +6,8 @@
 #define BASE_MESSAGE_LOOP_MESSAGE_PUMP_IO_IOS_H_
 
 #include "base/apple/scoped_cffiledescriptorref.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/base_export.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_pump_apple.h"
 #include "base/message_loop/watchable_io_message_pump_posix.h"

base/native_library_mac.mm

@@ -7,10 +7,10 @@
 #include <dlfcn.h>
 #include <mach-o/getsect.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/strcat.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"

base/power_monitor/battery_level_provider_mac.mm

@@ -8,8 +8,8 @@
 #include <IOKit/IOKitLib.h>
 #include <IOKit/ps/IOPSKeys.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 
 namespace base {

base/power_monitor/power_monitor_device_source.h

@@ -24,7 +24,7 @@
 #if BUILDFLAG(IS_MAC)
 #include <IOKit/IOTypes.h>
 
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/scoped_ionotificationportref.h"
 #include "base/power_monitor/battery_level_provider.h"
 #include "base/power_monitor/iopm_power_source_sampling_event_source.h"

base/power_monitor/power_monitor_device_source_mac.mm

@@ -7,8 +7,8 @@
 
 #include "base/power_monitor/power_monitor_device_source.h"
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_source.h"
 

base/power_monitor/thermal_state_observer_mac.mm

@@ -14,8 +14,8 @@
 
 #include <memory>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/logging.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_source.h"
 #include "base/power_monitor/power_observer.h"

base/strings/sys_string_conversions.h

@@ -20,7 +20,7 @@
 #if BUILDFLAG(IS_APPLE)
 #include <CoreFoundation/CoreFoundation.h>
 
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 
 #ifdef __OBJC__
 @class NSString;

base/strings/sys_string_conversions_apple.mm

@@ -10,8 +10,8 @@
 #include <vector>
 
 #include "base/apple/bridging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_piece.h"
 

base/time/time_apple.mm

@@ -15,9 +15,9 @@
 #include <time.h>
 
 #include "base/apple/mach_logging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/apple/scoped_mach_port.h"
 #include "base/logging.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/time/time_override.h"
 #include "build/build_config.h"

base/time/time_exploded_ios.cc

@@ -8,7 +8,7 @@
 #include <CoreFoundation/CFCalendar.h>
 #include <CoreFoundation/CFTimeZone.h>
 
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/numerics/safe_conversions.h"
 
 #if __LP64__

chrome/app/chrome_crash_reporter_client_mac.mm

@@ -6,7 +6,7 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
 #include "base/strings/sys_string_conversions.h"

chrome/browser/apps/app_shim/app_shim_host_bootstrap_mac.cc

@@ -8,8 +8,8 @@
 #include <memory>
 #include <utility>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/functional/bind.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"

chrome/browser/apps/app_shim/app_shim_manager_mac.h

@@ -14,8 +14,8 @@
 #include <vector>
 
 #include "apps/app_lifetime_monitor.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/functional/callback_forward.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/memory/raw_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/apps/app_shim/app_shim_host_bootstrap_mac.h"

chrome/browser/enterprise/connectors/device_trust/key_management/core/mac/mock_secure_enclave_client.h

@@ -12,8 +12,8 @@
 
 #include <vector>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/containers/span.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace enterprise_connectors::test {

chrome/browser/enterprise/connectors/device_trust/key_management/core/mac/mock_secure_enclave_helper.h

@@ -10,7 +10,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <Security/Security.h>
 
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace enterprise_connectors::test {

chrome/browser/enterprise/connectors/device_trust/key_management/core/mac/secure_enclave_client.h

@@ -11,8 +11,8 @@
 #include <string>
 #include <vector>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/containers/span.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace enterprise_connectors {

chrome/browser/enterprise/connectors/device_trust/key_management/core/mac/secure_enclave_client_impl.h

@@ -13,8 +13,8 @@
 #include <memory>
 #include <vector>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/containers/span.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/mac/secure_enclave_helper.h"
 
 namespace enterprise_connectors {

chrome/browser/enterprise/connectors/device_trust/key_management/core/mac/secure_enclave_client_impl.mm

@@ -12,8 +12,8 @@
 #include <vector>
 
 #include "base/apple/bridging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/containers/span.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/sys_string_conversions.h"

chrome/browser/enterprise/connectors/device_trust/key_management/core/mac/secure_enclave_client_unittest.mm

@@ -10,9 +10,9 @@
 #include <memory>
 
 #include "base/apple/bridging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/containers/span.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/memory/raw_ptr.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/test/metrics/histogram_tester.h"

chrome/browser/enterprise/connectors/device_trust/key_management/core/mac/secure_enclave_helper.h

@@ -10,7 +10,7 @@
 
 #include <memory>
 
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 
 namespace enterprise_connectors {
 

chrome/browser/enterprise/connectors/device_trust/key_management/core/mac/secure_enclave_helper_impl.h

@@ -10,7 +10,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <Security/Security.h>
 
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 
 namespace enterprise_connectors {
 

chrome/browser/enterprise/connectors/device_trust/key_management/core/mac/secure_enclave_helper_impl.mm

@@ -11,7 +11,7 @@
 #include <memory>
 
 #include "base/apple/bridging.h"
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 
 namespace enterprise_connectors {
 

chrome/browser/enterprise/connectors/device_trust/key_management/core/mac/secure_enclave_signing_key.cc

@@ -8,10 +8,10 @@
 #include <string>
 #include <vector>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/check.h"
 #include "base/containers/contains.h"
 #include "base/containers/span.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/mac/secure_enclave_client.h"
 #include "crypto/signature_verifier.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"

chrome/browser/enterprise/connectors/device_trust/key_management/core/mac/secure_enclave_signing_key_unittest.mm

@@ -13,8 +13,8 @@
 #include <vector>
 
 #include "base/apple/bridging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/containers/span.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/memory/raw_ptr.h"
 #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/mac/mock_secure_enclave_client.h"
 #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/mac/secure_enclave_client.h"

chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/mac_key_persistence_delegate_unittest.mm

@@ -11,8 +11,8 @@
 #include <utility>
 
 #include "base/apple/bridging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/containers/span.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/memory/raw_ptr.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/mac/mock_secure_enclave_client.h"

chrome/browser/extensions/api/enterprise_reporting_private/keychain_data_helper_mac.cc

@@ -7,8 +7,8 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <Security/Security.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 
 namespace extensions {

chrome/browser/extensions/api/image_writer_private/removable_storage_provider_mac.cc

@@ -11,8 +11,8 @@
 #include <IOKit/storage/IOStorageProtocolCharacteristics.h>
 #include <stdint.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/strings/sys_string_conversions.h"

chrome/browser/icon_loader_mac.mm

@@ -8,10 +8,10 @@
 #import <CoreServices/CoreServices.h>                      // pre-macOS 11
 #import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>  // macOS 11
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/functional/bind.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/task/thread_pool.h"
 #include "base/threading/thread.h"

chrome/browser/mac/dock.mm

@@ -13,10 +13,10 @@
 
 #include "base/apple/bridging.h"
 #include "base/apple/bundle_locations.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/launchd.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "build/branding_buildflags.h"
 
 extern "C" {

chrome/browser/mac/install_from_dmg.mm

@@ -23,6 +23,7 @@
 #include "base/apple/bundle_locations.h"
 #include "base/apple/mach_logging.h"
 #include "base/apple/osstatus_logging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ -31,7 +32,6 @@
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_authorizationref.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 #include "base/memory/scoped_policy.h"
 #include "base/strings/string_util.h"

chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm

@@ -6,13 +6,13 @@
 
 #import <AVFoundation/AVFoundation.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/check.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/functional/callback.h"
 #include "base/functional/callback_helpers.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/no_destructor.h"
 #import "base/task/sequenced_task_runner.h"
 #include "base/task/sequenced_task_runner.h"

chrome/browser/media/webrtc/window_icon_util_mac.mm

@@ -6,8 +6,8 @@
 
 #import <Cocoa/Cocoa.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "third_party/libyuv/include/libyuv/convert_argb.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 

chrome/browser/policy/browser_dm_token_storage_mac.mm

@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/base64url.h"
 #include "base/files/file_util.h"
 #include "base/files/important_file_writer.h"
@@ -15,7 +16,6 @@
 #include "base/hash/sha1.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/notreached.h"

chrome/browser/policy/policy_path_parser_mac.mm

@@ -10,10 +10,10 @@
 
 #include <string>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #include "build/branding_buildflags.h"
 #include "components/policy/policy_constants.h"

chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm

@@ -4,9 +4,9 @@
 
 #include <Cocoa/Cocoa.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/functional/bind.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/notreached.h"
 #include "base/run_loop.h"
 #include "base/test/simple_test_tick_clock.h"

chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac_unittest.cc

@@ -10,11 +10,11 @@
 #include <memory>
 
 #include "base/apple/bundle_locations.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/path_service.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/safe_browsing/incident_reporting/incident.h"

chrome/browser/safe_browsing/signature_evaluator_mac.h

@@ -9,8 +9,8 @@
 
 #include <string>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident.h"
 
 namespace safe_browsing {

chrome/browser/safe_browsing/signature_evaluator_mac.mm

@@ -12,9 +12,9 @@
 #include <sys/xattr.h>
 
 #include "base/apple/bridging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/common/safe_browsing/binary_feature_extractor.h"

chrome/browser/safe_browsing/signature_evaluator_mac_unittest.cc

@@ -12,10 +12,10 @@
 #include <string>
 #include <vector>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/path_service.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/test/scoped_path_override.h"

chrome/browser/shell_integration_mac.mm

@@ -9,9 +9,9 @@
 
 #include "base/apple/bridging.h"
 #include "base/apple/bundle_locations.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #include "build/branding_buildflags.h"
 #include "chrome/common/channel_info.h"

chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm

@@ -8,9 +8,9 @@
 
 #include <memory>
 
+#import "base/apple/scoped_cftyperef.h"
 #include "base/functional/callback_helpers.h"
 #import "base/mac/foundation_util.h"
-#import "base/mac/scoped_cftyperef.h"
 #include "base/memory/raw_ptr.h"
 #include "chrome/browser/apps/app_service/app_launch_params.h"
 #include "chrome/browser/apps/app_service/app_service_proxy.h"

chrome/browser/ui/cocoa/history_overlay_controller.mm

@@ -8,8 +8,8 @@
 
 #include <cmath>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/check.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "chrome/grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"

chrome/browser/web_applications/os_integration/icns_encoder_unittest.cc

@@ -8,13 +8,13 @@
 
 #include <numeric>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/path_service.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "testing/gmock/include/gmock/gmock.h"

chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm

@@ -15,6 +15,7 @@
 
 #include "base/apple/bridging.h"
 #include "base/apple/bundle_locations.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/base_switches.h"
 #include "base/check_is_test.h"
 #include "base/command_line.h"
@@ -30,7 +31,6 @@
 #include "base/mac/foundation_util.h"
 #import "base/mac/launch_application.h"
 #include "base/mac/mac_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"

chrome/browser/web_applications/test/os_integration_test_override_impl.cc

@@ -45,9 +45,9 @@
 #if BUILDFLAG(IS_MAC)
 #include <ImageIO/ImageIO.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/web_applications/app_shim_registry_mac.h"
 #include "net/base/filename_util.h"

chrome/common/extensions/image_writer/image_writer_util_mac.cc

@@ -9,8 +9,8 @@
 #include <IOKit/storage/IOMedia.h>
 
 #include "base/apple/mach_logging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 #include "base/strings/sys_string_conversions.h"
 

chrome/common/printing/printer_capabilities_mac.mm

@@ -6,10 +6,10 @@
 
 #import <AppKit/AppKit.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/check_op.h"
 #include "base/files/file_path.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/no_destructor.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/scoped_blocking_call.h"

chrome/test/base/interactive_test_utils_mac.mm

@@ -7,10 +7,10 @@
 #include <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/apple/scoped_objc_class_swizzler.h"
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/run_loop.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_browser_application_mac.h"

chrome/test/chromedriver/keycode_text_conversion_mac.mm

@@ -6,7 +6,7 @@
 
 #import <Carbon/Carbon.h>
 
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"

chrome/updater/device_management/dm_storage_mac.mm

@@ -8,13 +8,13 @@
 
 #include <string>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/important_file_writer.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/strings/string_util.h"

chrome/updater/mac/privileged_helper/service.mm

@@ -12,6 +12,7 @@
 #include <string>
 #include <utility>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
@@ -22,7 +23,6 @@
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/memory/raw_ptr.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/process/launch.h"

chrome/updater/mac/setup/wake_task_unittest.mm

@@ -6,8 +6,8 @@
 
 #include <Foundation/Foundation.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/strcat.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/updater/constants.h"

chrome/updater/policy/mac/managed_preference_policy_manager.mm

@@ -8,8 +8,8 @@
 #include <vector>
 
 #include "base/apple/bridging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/enterprise_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/strings/sys_string_conversions.h"

chrome/utility/image_writer/image_writer_mac.cc

@@ -13,10 +13,10 @@
 
 #include <memory>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/command_line.h"
 #include "base/files/scoped_file.h"
 #include "base/functional/bind.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/process/kill.h"

chrome/utility/safe_browsing/mac/udif.cc

@@ -13,9 +13,9 @@
 #include <memory>
 #include <utility>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/memory/raw_ptr.h"
 #include "base/notreached.h"
 #include "base/numerics/ostream_operators.h"

chrome/utility/safe_browsing/mac/udif.h

@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/memory/raw_ptr.h"
 
 namespace safe_browsing {

components/country_codes/country_codes.cc

@@ -18,7 +18,7 @@
 #include <windows.h>
 #undef IN  // On Windows, windef.h defines this, which screws up "India" cases.
 #elif BUILDFLAG(IS_APPLE)
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 #endif
 
 #if BUILDFLAG(IS_ANDROID)

components/device_signals/core/system_signals/mac/mac_platform_delegate.mm

@@ -7,9 +7,9 @@
 #include <CoreFoundation/CoreFoundation.h>
 #import <Foundation/Foundation.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #import "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "crypto/sha2.h"
 #include "net/cert/asn1_util.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"

components/memory_pressure/system_memory_pressure_evaluator_mac.h

@@ -8,8 +8,8 @@
 #include <CoreFoundation/CFDate.h>
 #include <dispatch/dispatch.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/apple/scoped_dispatch_object.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/message_loop/message_pump_apple.h"
 #include "base/sequence_checker.h"
 #include "base/timer/timer.h"

components/memory_pressure/system_memory_pressure_evaluator_mac_unittest.cc

@@ -4,9 +4,9 @@
 
 #include "components/memory_pressure/system_memory_pressure_evaluator_mac.h"
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/functional/bind.h"
 #include "base/functional/callback_helpers.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/task_environment.h"
 #include "components/memory_pressure/multi_source_memory_pressure_monitor.h"

components/metal_util/hdr_copier_layer.mm

@@ -10,8 +10,8 @@
 #include <MetalKit/MetalKit.h>
 
 #include "base/apple/bridging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/metal_util/device.h"
 #include "third_party/skia/modules/skcms/skcms.h"

components/metrics/drive_metrics_provider_mac.mm

@@ -13,10 +13,10 @@
 #include <sys/stat.h>
 
 #include "base/apple/bridging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 
 namespace metrics {

components/os_crypt/sync/keychain_password_mac.mm

@@ -7,8 +7,8 @@
 #import <Security/Security.h>
 
 #include "base/apple/osstatus_logging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/base64.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/no_destructor.h"
 #include "base/rand_util.h"
 #include "build/branding_buildflags.h"

components/password_manager/core/browser/login_database_ios.cc

@@ -11,10 +11,10 @@
 #include <memory>
 
 #include "base/apple/osstatus_logging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/password_manager/core/common/passwords_directory_util_ios.h"

components/password_manager/core/browser/login_database_ios_unittest.cc

@@ -10,9 +10,9 @@
 
 #include <tuple>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/task_environment.h"

components/policy/core/common/cloud/cloud_policy_util.cc

@@ -67,7 +67,7 @@
 #endif
 
 #if BUILDFLAG(IS_APPLE)
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #endif

components/policy/core/common/mac_util_unittest.cc

@@ -8,7 +8,7 @@
 
 #include <memory>
 
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/values.h"
 #include "components/policy/core/common/policy_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"

components/policy/core/common/policy_loader_ios_unittest.mm

@@ -8,10 +8,10 @@
 
 #include <memory>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/functional/callback.h"
 #include "base/json/json_string_value_serializer.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #import "base/task/sequenced_task_runner.h"
 #include "base/task/sequenced_task_runner.h"

components/policy/core/common/policy_loader_mac.h

@@ -7,9 +7,9 @@
 
 #include <string>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/files/file_path_watcher.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
 #include "components/policy/core/common/async_policy_loader.h"

components/policy/core/common/policy_loader_mac_unittest.cc

@@ -9,9 +9,9 @@
 #include <memory>
 #include <utility>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/functional/callback.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/memory/raw_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/sys_string_conversions.h"

components/policy/core/common/policy_test_utils.cc

@@ -19,7 +19,7 @@
 #if BUILDFLAG(IS_APPLE)
 #include <CoreFoundation/CoreFoundation.h>
 
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 #endif
 
 namespace policy {

components/policy/core/common/preferences_mock_mac.h

@@ -5,7 +5,7 @@
 #ifndef COMPONENTS_POLICY_CORE_COMMON_PREFERENCES_MOCK_MAC_H_
 #define COMPONENTS_POLICY_CORE_COMMON_PREFERENCES_MOCK_MAC_H_
 
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "components/policy/core/common/preferences_mac.h"
 #include "components/policy/policy_export.h"
 

components/power_metrics/energy_impact_mac.mm

@@ -7,8 +7,8 @@
 #include <Foundation/Foundation.h>
 #import <IOKit/IOKitLib.h>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/time/time.h"

components/power_metrics/m1_sensors_mac.h

@@ -12,7 +12,7 @@
 
 #include <memory>
 
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace power_metrics {

components/remote_cocoa/app_shim/certificate_viewer.mm

@@ -9,8 +9,8 @@
 #import <SecurityInterface/SecurityInterface.h>
 
 #include "base/apple/bridging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/notreached.h"
 #include "net/cert/x509_util_apple.h"
 

components/remote_cocoa/app_shim/select_file_dialog_bridge.mm

@@ -11,11 +11,11 @@
 #include <stddef.h>
 
 #include "base/apple/bridging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_util.h"
 #include "base/i18n/case_conversion.h"
 #include "base/mac/foundation_util.h"
 #import "base/mac/mac_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/hang_watcher.h"

components/services/quarantine/common_mac.mm

@@ -8,11 +8,11 @@
 #include <Foundation/Foundation.h>
 
 #include "base/apple/osstatus_logging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 
 namespace quarantine {

components/services/quarantine/quarantine_mac.mm

@@ -9,12 +9,12 @@
 
 #include "base/apple/bridging.h"
 #include "base/apple/osstatus_logging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/scoped_blocking_call.h"
 #include "components/services/quarantine/common.h"

components/services/quarantine/quarantine_mac_unittest.mm

@@ -8,12 +8,12 @@
 #import <Foundation/Foundation.h>
 
 #include "base/apple/bridging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/functional/bind.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/run_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/test/task_environment.h"

components/storage_monitor/storage_monitor_mac.h

@@ -10,7 +10,7 @@
 #include <map>
 #include <memory>
 
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/memory/weak_ptr.h"
 #include "components/storage_monitor/storage_monitor.h"
 

components/sync_device_info/local_device_info_util_mac.mm

@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 

components/viz/service/display_embedder/software_output_device_mac.h

@@ -9,7 +9,7 @@
 #include <list>
 #include <memory>
 
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/memory/raw_ptr.h"
 #include "base/task/sequenced_task_runner.h"
 #include "components/viz/service/display/software_output_device.h"

components/wifi/wifi_service_mac.mm

@@ -13,9 +13,9 @@
 #include <string>
 #include <utility>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/functional/bind.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #import "base/task/sequenced_task_runner.h"
 #import "base/task/single_thread_task_runner.h"

content/app_shim_remote_cocoa/render_widget_host_ns_view_bridge.mm

@@ -7,8 +7,8 @@
 #include <Foundation/Foundation.h>
 
 #include "base/apple/bridging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/remote_cocoa/app_shim/ns_view_ids.h"
 #include "content/app_shim_remote_cocoa/render_widget_host_ns_view_host_helper.h"

content/browser/accessibility/browser_accessibility_cocoa.mm

@@ -14,8 +14,8 @@
 #include <memory>
 #include <utility>
 
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/memory/raw_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"