Rename //net/base/mac directory to //net/base/apple (2/n)
This renames the remaining directory in //net/base used both by macOS
and iOS, following the naming convention and changing it something more
suggestive.
Like suggested by mark@, this renaming process will be carried on in
three steps:
1. Rename net/base/mac to net/base/apple, creating new temporary
forwarding headers in net/base/mac that #include net/base/apple.
2. Convert all of the use sites from net/base/mac to net/base/apple.
This can be done across multiple ch anges if desirable, which could make
things more manageable for reviewers. The changes here are performing
this step in //chrome and //ios/chrome directories, using the following
command:
LC_CTYPE=C find . -type f -exec sed -i "" "s:net/base/mac/:net/base/apple/:g" {} \;
3. Remove the temporary forwarding headers in net/base/mac, so that
we’re only left with net/base/apple.
Bug: 1519486
Change-Id: I6b09449c9a13a42f09262d267315d4c0450ddb73
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5216594
Reviewed-by: David Roger <droger@chromium.org>
Commit-Queue: Tiago Vignatti <tvignatti@igalia.com>
Reviewed-by: Mark Mentovai <mark@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1250949}
diff --git a/chrome/app_shim/app_shim_delegate.mm b/chrome/app_shim/app_shim_delegate.mm
index 51f59b9..7e7c54b2 100644
--- a/chrome/app_shim/app_shim_delegate.mm
+++ b/chrome/app_shim/app_shim_delegate.mm
@@ -8,7 +8,7 @@
#include "base/memory/raw_ptr.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/app_shim/app_shim_controller.h"
-#include "net/base/mac/url_conversions.h"
+#include "net/base/apple/url_conversions.h"
@implementation AppShimDelegate {
raw_ptr<AppShimController> _appShimController; // Weak, owns |this|
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 6fc35eb..5849d6e 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -114,8 +114,8 @@
#include "content/public/browser/download_manager.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
+#include "net/base/apple/url_conversions.h"
#include "net/base/filename_util.h"
-#include "net/base/mac/url_conversions.h"
#import "ui/base/cocoa/nsmenu_additions.h"
#import "ui/base/cocoa/nsmenuitem_additions.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm
index 4dba232..d853e25 100644
--- a/chrome/browser/app_controller_mac_browsertest.mm
+++ b/chrome/browser/app_controller_mac_browsertest.mm
@@ -86,7 +86,7 @@
#include "extensions/browser/extension_dialog_auto_confirm.h"
#include "extensions/common/extension.h"
#include "extensions/test/extension_test_message_listener.h"
-#include "net/base/mac/url_conversions.h"
+#include "net/base/apple/url_conversions.h"
#include "net/dns/mock_host_resolver.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "third_party/blink/public/common/features.h"
diff --git a/chrome/browser/app_controller_mac_interactive_uitest.mm b/chrome/browser/app_controller_mac_interactive_uitest.mm
index 4b4e399..0e1207a 100644
--- a/chrome/browser/app_controller_mac_interactive_uitest.mm
+++ b/chrome/browser/app_controller_mac_interactive_uitest.mm
@@ -25,7 +25,7 @@
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/test/browser_test.h"
#include "extensions/browser/app_window/app_window_registry.h"
-#include "net/base/mac/url_conversions.h"
+#include "net/base/apple/url_conversions.h"
namespace {
diff --git a/chrome/browser/apps/link_capturing/mac_intent_picker_helpers.mm b/chrome/browser/apps/link_capturing/mac_intent_picker_helpers.mm
index 4d79e0e..d6f9de79 100644
--- a/chrome/browser/apps/link_capturing/mac_intent_picker_helpers.mm
+++ b/chrome/browser/apps/link_capturing/mac_intent_picker_helpers.mm
@@ -12,7 +12,7 @@
#include "base/mac/launch_application.h"
#include "base/no_destructor.h"
#include "base/strings/sys_string_conversions.h"
-#include "net/base/mac/url_conversions.h"
+#include "net/base/apple/url_conversions.h"
#include "ui/base/models/image_model.h"
namespace apps {
diff --git a/chrome/browser/download/download_status_updater_mac.mm b/chrome/browser/download/download_status_updater_mac.mm
index 83c536b..7219e2e3 100644
--- a/chrome/browser/download/download_status_updater_mac.mm
+++ b/chrome/browser/download/download_status_updater_mac.mm
@@ -12,7 +12,7 @@
#include "base/time/time.h"
#import "chrome/browser/ui/cocoa/dock_icon.h"
#include "components/download/public/common/download_item.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
namespace {
diff --git a/chrome/browser/mac/auth_session_request.mm b/chrome/browser/mac/auth_session_request.mm
index d9d2e79..cd85ff3 100644
--- a/chrome/browser/mac/auth_session_request.mm
+++ b/chrome/browser/mac/auth_session_request.mm
@@ -23,7 +23,7 @@
#include "content/public/browser/navigation_handle.h"
#include "content/public/browser/navigation_throttle.h"
#include "content/public/browser/web_contents.h"
-#include "net/base/mac/url_conversions.h"
+#include "net/base/apple/url_conversions.h"
#include "url/url_canon.h"
namespace {
diff --git a/chrome/browser/mac/auth_session_request_browsertest.mm b/chrome/browser/mac/auth_session_request_browsertest.mm
index d566ac7..c9ee97f5 100644
--- a/chrome/browser/mac/auth_session_request_browsertest.mm
+++ b/chrome/browser/mac/auth_session_request_browsertest.mm
@@ -17,7 +17,7 @@
#include "chrome/test/base/ui_test_utils.h"
#include "components/prefs/pref_service.h"
#include "content/public/test/browser_test.h"
-#include "net/base/mac/url_conversions.h"
+#include "net/base/apple/url_conversions.h"
#include "net/http/http_status_code.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "net/test/embedded_test_server/http_response.h"
diff --git a/chrome/browser/platform_util_mac.mm b/chrome/browser/platform_util_mac.mm
index e9ada9a..716fe6cd5 100644
--- a/chrome/browser/platform_util_mac.mm
+++ b/chrome/browser/platform_util_mac.mm
@@ -19,7 +19,7 @@
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_switches.h"
-#include "net/base/mac/url_conversions.h"
+#include "net/base/apple/url_conversions.h"
#include "ui/views/widget/widget.h"
#include "url/gurl.h"
diff --git a/chrome/browser/shell_integration_mac.mm b/chrome/browser/shell_integration_mac.mm
index 97547d9..f471a4c 100644
--- a/chrome/browser/shell_integration_mac.mm
+++ b/chrome/browser/shell_integration_mac.mm
@@ -16,7 +16,7 @@
#include "build/branding_buildflags.h"
#include "chrome/common/channel_info.h"
#include "components/version_info/version_info.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
namespace shell_integration {
diff --git a/chrome/browser/ui/cocoa/screentime/history_deleter_impl.mm b/chrome/browser/ui/cocoa/screentime/history_deleter_impl.mm
index a97cebf..987b89e 100644
--- a/chrome/browser/ui/cocoa/screentime/history_deleter_impl.mm
+++ b/chrome/browser/ui/cocoa/screentime/history_deleter_impl.mm
@@ -10,7 +10,7 @@
#include "base/memory/ptr_util.h"
#include "base/notreached.h"
#include "base/strings/sys_string_conversions.h"
-#include "net/base/mac/url_conversions.h"
+#include "net/base/apple/url_conversions.h"
namespace screentime {
diff --git a/chrome/browser/ui/cocoa/screentime/webpage_controller_impl.mm b/chrome/browser/ui/cocoa/screentime/webpage_controller_impl.mm
index ce66e8c2..8aa86903 100644
--- a/chrome/browser/ui/cocoa/screentime/webpage_controller_impl.mm
+++ b/chrome/browser/ui/cocoa/screentime/webpage_controller_impl.mm
@@ -9,7 +9,7 @@
#include "base/apple/foundation_util.h"
#include "base/memory/raw_ptr.h"
#include "base/strings/sys_string_conversions.h"
-#include "net/base/mac/url_conversions.h"
+#include "net/base/apple/url_conversions.h"
@interface BlockedObserver : NSObject
@end
diff --git a/chrome/browser/ui/cocoa/share_menu_controller.mm b/chrome/browser/ui/cocoa/share_menu_controller.mm
index 3c8fd95..2694e20 100644
--- a/chrome/browser/ui/cocoa/share_menu_controller.mm
+++ b/chrome/browser/ui/cocoa/share_menu_controller.mm
@@ -21,7 +21,7 @@
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/grit/generated_resources.h"
#include "components/omnibox/browser/location_bar_model.h"
-#include "net/base/mac/url_conversions.h"
+#include "net/base/apple/url_conversions.h"
#include "ui/base/accelerators/platform_accelerator_cocoa.h"
#include "ui/base/l10n/l10n_util_mac.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/chrome/browser/ui/cocoa/share_menu_controller_browsertest.mm b/chrome/browser/ui/cocoa/share_menu_controller_browsertest.mm
index 6122054..969849e 100644
--- a/chrome/browser/ui/cocoa/share_menu_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/share_menu_controller_browsertest.mm
@@ -16,7 +16,7 @@
#include "chrome/grit/generated_resources.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "content/public/test/browser_test.h"
-#include "net/base/mac/url_conversions.h"
+#include "net/base/apple/url_conversions.h"
#include "testing/gtest_mac.h"
#include "ui/base/l10n/l10n_util_mac.h"
#include "ui/events/test/cocoa_test_event_utils.h"
diff --git a/chrome/updater/net/network_fetcher_mac.mm b/chrome/updater/net/network_fetcher_mac.mm
index db81d9a..0e22f5b 100644
--- a/chrome/updater/net/network_fetcher_mac.mm
+++ b/chrome/updater/net/network_fetcher_mac.mm
@@ -27,7 +27,7 @@
#include "chrome/updater/policy/service.h"
#include "chrome/updater/util/util.h"
#include "components/update_client/network.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "url/gurl.h"
using ResponseStartedCallback =
diff --git a/ios/chrome/app/app_startup_parameters.mm b/ios/chrome/app/app_startup_parameters.mm
index 3816849..4e5abbc7 100644
--- a/ios/chrome/app/app_startup_parameters.mm
+++ b/ios/chrome/app/app_startup_parameters.mm
@@ -7,7 +7,7 @@
#import "base/feature_list.h"
#import "ios/chrome/browser/shared/model/url/chrome_url_constants.h"
#import "ios/chrome/browser/shared/public/features/features.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/base/url_util.h"
#import "url/gurl.h"
diff --git a/ios/chrome/app/application_delegate/mock_tab_opener.mm b/ios/chrome/app/application_delegate/mock_tab_opener.mm
index 11aeb96c..1705f73 100644
--- a/ios/chrome/app/application_delegate/mock_tab_opener.mm
+++ b/ios/chrome/app/application_delegate/mock_tab_opener.mm
@@ -7,7 +7,7 @@
#import "base/ios/block_types.h"
#import "ios/chrome/app/application_mode.h"
#import "ios/chrome/browser/url_loading/model/url_loading_params.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/page_transition_types.h"
#import "url/gurl.h"
diff --git a/ios/chrome/app/application_delegate/url_opener_unittest.mm b/ios/chrome/app/application_delegate/url_opener_unittest.mm
index 734068f..734f208c 100644
--- a/ios/chrome/app/application_delegate/url_opener_unittest.mm
+++ b/ios/chrome/app/application_delegate/url_opener_unittest.mm
@@ -23,7 +23,7 @@
#import "ios/chrome/browser/url_loading/model/url_loading_params.h"
#import "ios/testing/open_url_context.h"
#import "ios/web/public/test/web_task_environment.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "testing/gtest_mac.h"
#import "testing/platform_test.h"
#import "third_party/ocmock/OCMock/OCMock.h"
diff --git a/ios/chrome/app/main_controller.mm b/ios/chrome/app/main_controller.mm
index f189cb7..5ca932e 100644
--- a/ios/chrome/app/main_controller.mm
+++ b/ios/chrome/app/main_controller.mm
@@ -137,7 +137,7 @@
#import "ios/public/provider/chrome/browser/ui_utils/ui_utils_api.h"
#import "ios/public/provider/chrome/browser/user_feedback/user_feedback_api.h"
#import "ios/web/public/webui/web_ui_ios_controller_factory.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "services/network/public/cpp/shared_url_loader_factory.h"
#if BUILDFLAG(IOS_CREDENTIAL_PROVIDER_ENABLED)
diff --git a/ios/chrome/app/spotlight/actions_spotlight_manager.mm b/ios/chrome/app/spotlight/actions_spotlight_manager.mm
index 3f822eb5..af6cc206 100644
--- a/ios/chrome/app/spotlight/actions_spotlight_manager.mm
+++ b/ios/chrome/app/spotlight/actions_spotlight_manager.mm
@@ -18,7 +18,7 @@
#import "ios/chrome/common/app_group/app_group_constants.h"
#import "ios/chrome/grit/ios_branded_strings.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
#import "url/gurl.h"
diff --git a/ios/chrome/app/spotlight/bookmark_spotlight_manager_unittest.mm b/ios/chrome/app/spotlight/bookmark_spotlight_manager_unittest.mm
index 6c9f27142e..c867dfe2 100644
--- a/ios/chrome/app/spotlight/bookmark_spotlight_manager_unittest.mm
+++ b/ios/chrome/app/spotlight/bookmark_spotlight_manager_unittest.mm
@@ -23,7 +23,7 @@
#import "ios/chrome/app/spotlight/spotlight_util.h"
#import "ios/chrome/browser/bookmarks/model/bookmark_ios_unit_test_support.h"
#import "ios/chrome/browser/shared/model/browser_state/test_chrome_browser_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "testing/gmock/include/gmock/gmock.h"
#import "testing/gtest/include/gtest/gtest.h"
#import "testing/gtest_mac.h"
diff --git a/ios/chrome/app/spotlight/reading_list_spotlight_manager_unittest.mm b/ios/chrome/app/spotlight/reading_list_spotlight_manager_unittest.mm
index 18e6981..8669e6d 100644
--- a/ios/chrome/app/spotlight/reading_list_spotlight_manager_unittest.mm
+++ b/ios/chrome/app/spotlight/reading_list_spotlight_manager_unittest.mm
@@ -20,7 +20,7 @@
#import "ios/chrome/browser/reading_list/model/reading_list_model_factory.h"
#import "ios/chrome/browser/reading_list/model/reading_list_test_utils.h"
#import "ios/chrome/browser/shared/model/browser_state/test_chrome_browser_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "testing/gmock/include/gmock/gmock.h"
#import "testing/gtest/include/gtest/gtest.h"
#import "testing/gtest_mac.h"
diff --git a/ios/chrome/app/spotlight/searchable_item_factory.mm b/ios/chrome/app/spotlight/searchable_item_factory.mm
index f877193..d0a2c5ab 100644
--- a/ios/chrome/app/spotlight/searchable_item_factory.mm
+++ b/ios/chrome/app/spotlight/searchable_item_factory.mm
@@ -19,7 +19,7 @@
#import "components/favicon_base/favicon_types.h"
#import "ios/chrome/app/spotlight/spotlight_logger.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "skia/ext/skia_utils_ios.h"
#import "ui/base/l10n/l10n_util.h"
diff --git a/ios/chrome/app/startup/chrome_app_startup_parameters.mm b/ios/chrome/app/startup/chrome_app_startup_parameters.mm
index a477046..fa029469 100644
--- a/ios/chrome/app/startup/chrome_app_startup_parameters.mm
+++ b/ios/chrome/app/startup/chrome_app_startup_parameters.mm
@@ -20,7 +20,7 @@
#import "ios/chrome/common/app_group/app_group_constants.h"
#import "ios/chrome/common/x_callback_url.h"
#import "ios/components/webui/web_ui_url_constants.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/base/url_util.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/app_launcher/model/app_launcher_browser_agent.mm b/ios/chrome/browser/app_launcher/model/app_launcher_browser_agent.mm
index b018761..a889805 100644
--- a/ios/chrome/browser/app_launcher/model/app_launcher_browser_agent.mm
+++ b/ios/chrome/browser/app_launcher/model/app_launcher_browser_agent.mm
@@ -23,7 +23,7 @@
#import "ios/chrome/browser/shared/model/web_state_list/web_state_opener.h"
#import "ios/web/public/navigation/navigation_manager.h"
#import "ios/web/public/web_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "url/gurl.h"
BROWSER_USER_DATA_KEY_IMPL(AppLauncherBrowserAgent)
diff --git a/ios/chrome/browser/app_launcher/model/app_launcher_browser_agent_unittest.mm b/ios/chrome/browser/app_launcher/model/app_launcher_browser_agent_unittest.mm
index 160f5388..cfc7191 100644
--- a/ios/chrome/browser/app_launcher/model/app_launcher_browser_agent_unittest.mm
+++ b/ios/chrome/browser/app_launcher/model/app_launcher_browser_agent_unittest.mm
@@ -27,7 +27,7 @@
#import "ios/web/public/test/fakes/fake_web_state.h"
#import "ios/web/public/test/web_task_environment.h"
#import "ios/web/public/web_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "testing/gtest/include/gtest/gtest.h"
#import "testing/platform_test.h"
#import "third_party/ocmock/OCMock/OCMock.h"
diff --git a/ios/chrome/browser/app_launcher/model/app_launcher_tab_helper.mm b/ios/chrome/browser/app_launcher/model/app_launcher_tab_helper.mm
index 980709b..2290ffc 100644
--- a/ios/chrome/browser/app_launcher/model/app_launcher_tab_helper.mm
+++ b/ios/chrome/browser/app_launcher/model/app_launcher_tab_helper.mm
@@ -24,7 +24,7 @@
#import "ios/web/public/navigation/navigation_item.h"
#import "ios/web/public/navigation/navigation_manager.h"
#import "ios/web/public/web_client.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "url/gurl.h"
namespace {
diff --git a/ios/chrome/browser/crash_report/model/crash_report_helper.mm b/ios/chrome/browser/crash_report/model/crash_report_helper.mm
index 9ab6e82..6277a04 100644
--- a/ios/chrome/browser/crash_report/model/crash_report_helper.mm
+++ b/ios/chrome/browser/crash_report/model/crash_report_helper.mm
@@ -28,7 +28,7 @@
#import "ios/web/public/thread/web_thread.h"
#import "ios/web/public/web_state.h"
#import "ios/web/public/web_state_observer_bridge.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
// WebStateList Observer that some tabs stats to be sent to the crash server.
@interface CrashReporterTabStateObserver
diff --git a/ios/chrome/browser/credential_provider/model/credential_provider_util.mm b/ios/chrome/browser/credential_provider/model/credential_provider_util.mm
index c800d89..e61e5aa4 100644
--- a/ios/chrome/browser/credential_provider/model/credential_provider_util.mm
+++ b/ios/chrome/browser/credential_provider/model/credential_provider_util.mm
@@ -22,7 +22,7 @@
#import "ios/chrome/common/credential_provider/credential.h"
#import "ios/chrome/common/ui/favicon/favicon_attributes.h"
#import "ios/chrome/common/ui/favicon/favicon_constants.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
using base::SysUTF16ToNSString;
using base::UTF8ToUTF16;
diff --git a/ios/chrome/browser/device_sharing/model/device_sharing_browser_agent_unittest.mm b/ios/chrome/browser/device_sharing/model/device_sharing_browser_agent_unittest.mm
index e05ff99..acbbf62 100644
--- a/ios/chrome/browser/device_sharing/model/device_sharing_browser_agent_unittest.mm
+++ b/ios/chrome/browser/device_sharing/model/device_sharing_browser_agent_unittest.mm
@@ -16,7 +16,7 @@
#import "ios/chrome/browser/shared/model/web_state_list/web_state_opener.h"
#import "ios/web/public/test/fakes/fake_web_state.h"
#import "ios/web/public/test/web_task_environment.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "testing/gtest_mac.h"
#import "testing/platform_test.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/device_sharing/model/device_sharing_manager_impl_unittest.mm b/ios/chrome/browser/device_sharing/model/device_sharing_manager_impl_unittest.mm
index f0c9a1a..50a51b5 100644
--- a/ios/chrome/browser/device_sharing/model/device_sharing_manager_impl_unittest.mm
+++ b/ios/chrome/browser/device_sharing/model/device_sharing_manager_impl_unittest.mm
@@ -14,7 +14,7 @@
#import "ios/chrome/browser/shared/model/browser/test/test_browser.h"
#import "ios/chrome/browser/shared/model/browser_state/test_chrome_browser_state.h"
#import "ios/web/public/test/web_task_environment.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "testing/gtest_mac.h"
#import "testing/platform_test.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/device_sharing/model/handoff_manager_egtest.mm b/ios/chrome/browser/device_sharing/model/handoff_manager_egtest.mm
index a5e71ff..ec069e0 100644
--- a/ios/chrome/browser/device_sharing/model/handoff_manager_egtest.mm
+++ b/ios/chrome/browser/device_sharing/model/handoff_manager_egtest.mm
@@ -8,7 +8,7 @@
#import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
#import "ios/chrome/test/earl_grey/chrome_test_case.h"
#import "ios/testing/earl_grey/earl_grey_test.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/test/embedded_test_server/embedded_test_server.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/download/model/ar_quick_look_tab_helper.mm b/ios/chrome/browser/download/model/ar_quick_look_tab_helper.mm
index d1e97275..351d11d 100644
--- a/ios/chrome/browser/download/model/ar_quick_look_tab_helper.mm
+++ b/ios/chrome/browser/download/model/ar_quick_look_tab_helper.mm
@@ -18,7 +18,7 @@
#import "ios/chrome/browser/download/model/download_directory_util.h"
#import "ios/chrome/browser/download/model/mime_type_util.h"
#import "ios/web/public/download/download_task.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/base/net_errors.h"
#import "net/base/url_util.h"
diff --git a/ios/chrome/browser/download/model/ar_quick_look_tab_helper_unittest.mm b/ios/chrome/browser/download/model/ar_quick_look_tab_helper_unittest.mm
index e6f4e10..9c21cdb5 100644
--- a/ios/chrome/browser/download/model/ar_quick_look_tab_helper_unittest.mm
+++ b/ios/chrome/browser/download/model/ar_quick_look_tab_helper_unittest.mm
@@ -18,7 +18,7 @@
#import "ios/web/public/test/fakes/fake_download_task.h"
#import "ios/web/public/test/fakes/fake_web_state.h"
#import "ios/web/public/test/web_task_environment.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/base/net_errors.h"
#import "testing/gtest/include/gtest/gtest.h"
#import "testing/gtest_mac.h"
diff --git a/ios/chrome/browser/download/model/safari_download_tab_helper.mm b/ios/chrome/browser/download/model/safari_download_tab_helper.mm
index 3444c3f..08568b7 100644
--- a/ios/chrome/browser/download/model/safari_download_tab_helper.mm
+++ b/ios/chrome/browser/download/model/safari_download_tab_helper.mm
@@ -6,7 +6,7 @@
#import "ios/chrome/browser/download/model/safari_download_tab_helper_delegate.h"
#import "ios/web/public/download/download_task.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
void SafariDownloadTabHelper::DownloadMobileConfig(
std::unique_ptr<web::DownloadTask> task) {
diff --git a/ios/chrome/browser/download/model/vcard_tab_helper.mm b/ios/chrome/browser/download/model/vcard_tab_helper.mm
index 99280a1..eb448dd 100644
--- a/ios/chrome/browser/download/model/vcard_tab_helper.mm
+++ b/ios/chrome/browser/download/model/vcard_tab_helper.mm
@@ -9,7 +9,7 @@
#import "ios/chrome/browser/download/model/mime_type_util.h"
#import "ios/chrome/browser/download/model/vcard_tab_helper_delegate.h"
#import "ios/web/public/download/download_task.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
VcardTabHelper::VcardTabHelper(web::WebState* web_state) {
DCHECK(web_state);
diff --git a/ios/chrome/browser/drag_and_drop/model/drag_item_util.mm b/ios/chrome/browser/drag_and_drop/model/drag_item_util.mm
index 1e8c9d1..36095bba 100644
--- a/ios/chrome/browser/drag_and_drop/model/drag_item_util.mm
+++ b/ios/chrome/browser/drag_and_drop/model/drag_item_util.mm
@@ -8,7 +8,7 @@
#import "ios/chrome/browser/window_activities/model/window_activity_helpers.h"
#import "ios/web/public/browser_state.h"
#import "ios/web/public/web_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
@implementation TabInfo
- (instancetype)initWithTabID:(web::WebStateID)tabID incognito:(BOOL)incognito {
diff --git a/ios/chrome/browser/drag_and_drop/model/table_view_url_drag_drop_handler.mm b/ios/chrome/browser/drag_and_drop/model/table_view_url_drag_drop_handler.mm
index ffbbc00..4ff27f8 100644
--- a/ios/chrome/browser/drag_and_drop/model/table_view_url_drag_drop_handler.mm
+++ b/ios/chrome/browser/drag_and_drop/model/table_view_url_drag_drop_handler.mm
@@ -9,7 +9,7 @@
#import "base/apple/foundation_util.h"
#import "base/check_op.h"
#import "ios/chrome/browser/drag_and_drop/model/drag_item_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "url/gurl.h"
@implementation TableViewURLDragDropHandler
diff --git a/ios/chrome/browser/drag_and_drop/model/url_drag_drop_handler.mm b/ios/chrome/browser/drag_and_drop/model/url_drag_drop_handler.mm
index f205a4a..e1a75e8 100644
--- a/ios/chrome/browser/drag_and_drop/model/url_drag_drop_handler.mm
+++ b/ios/chrome/browser/drag_and_drop/model/url_drag_drop_handler.mm
@@ -9,7 +9,7 @@
#import "base/apple/foundation_util.h"
#import "base/check_op.h"
#import "ios/chrome/browser/drag_and_drop/model/drag_item_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "url/gurl.h"
@implementation URLDragDropHandler
diff --git a/ios/chrome/browser/feature_engagement/model/feature_engagement_egtest.mm b/ios/chrome/browser/feature_engagement/model/feature_engagement_egtest.mm
index b8c72bd..1dc70f2 100644
--- a/ios/chrome/browser/feature_engagement/model/feature_engagement_egtest.mm
+++ b/ios/chrome/browser/feature_engagement/model/feature_engagement_egtest.mm
@@ -20,7 +20,7 @@
#import "ios/chrome/test/scoped_eg_synchronization_disabler.h"
#import "ios/testing/earl_grey/app_launch_manager.h"
#import "ios/testing/earl_grey/earl_grey_test.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/test/embedded_test_server/embedded_test_server.h"
#import "net/test/embedded_test_server/http_response.h"
#import "net/test/embedded_test_server/request_handler_util.h"
diff --git a/ios/chrome/browser/follow/model/follow_java_script_feature.mm b/ios/chrome/browser/follow/model/follow_java_script_feature.mm
index 6b76158..3bd09b8 100644
--- a/ios/chrome/browser/follow/model/follow_java_script_feature.mm
+++ b/ios/chrome/browser/follow/model/follow_java_script_feature.mm
@@ -6,7 +6,7 @@
#import "ios/web/public/js_messaging/web_frames_manager.h"
#import "ios/web/public/web_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
namespace {
const char kRSSLinkScript[] = "rss_link";
diff --git a/ios/chrome/browser/follow/model/follow_java_script_feature_unittest.mm b/ios/chrome/browser/follow/model/follow_java_script_feature_unittest.mm
index abf2651..79c688b 100644
--- a/ios/chrome/browser/follow/model/follow_java_script_feature_unittest.mm
+++ b/ios/chrome/browser/follow/model/follow_java_script_feature_unittest.mm
@@ -11,7 +11,7 @@
#import "ios/web/public/test/web_state_test_util.h"
#import "ios/web/public/test/web_task_environment.h"
#import "ios/web/public/web_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "testing/gtest_mac.h"
#import "testing/platform_test.h"
diff --git a/ios/chrome/browser/https_upgrades/model/https_only_mode_upgrade_tab_helper.mm b/ios/chrome/browser/https_upgrades/model/https_only_mode_upgrade_tab_helper.mm
index dcbe6f3..4d6700da 100644
--- a/ios/chrome/browser/https_upgrades/model/https_only_mode_upgrade_tab_helper.mm
+++ b/ios/chrome/browser/https_upgrades/model/https_only_mode_upgrade_tab_helper.mm
@@ -22,7 +22,7 @@
#import "ios/web/public/navigation/navigation_context.h"
#import "ios/web/public/navigation/navigation_item.h"
#import "ios/web/public/navigation/navigation_manager.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/base/url_util.h"
#import "url/url_constants.h"
diff --git a/ios/chrome/browser/https_upgrades/model/https_only_mode_upgrade_tab_helper_unittest.mm b/ios/chrome/browser/https_upgrades/model/https_only_mode_upgrade_tab_helper_unittest.mm
index 96c307e8..77eea3e 100644
--- a/ios/chrome/browser/https_upgrades/model/https_only_mode_upgrade_tab_helper_unittest.mm
+++ b/ios/chrome/browser/https_upgrades/model/https_only_mode_upgrade_tab_helper_unittest.mm
@@ -22,7 +22,7 @@
#import "ios/web/public/navigation/web_state_policy_decider.h"
#import "ios/web/public/test/fakes/fake_navigation_manager.h"
#import "ios/web/public/test/fakes/fake_web_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "testing/gtest/include/gtest/gtest.h"
#import "testing/platform_test.h"
diff --git a/ios/chrome/browser/https_upgrades/model/typed_navigation_upgrade_tab_helper.mm b/ios/chrome/browser/https_upgrades/model/typed_navigation_upgrade_tab_helper.mm
index d15e7266..dc45b22 100644
--- a/ios/chrome/browser/https_upgrades/model/typed_navigation_upgrade_tab_helper.mm
+++ b/ios/chrome/browser/https_upgrades/model/typed_navigation_upgrade_tab_helper.mm
@@ -17,7 +17,7 @@
#import "ios/web/public/navigation/navigation_context.h"
#import "ios/web/public/navigation/navigation_item.h"
#import "ios/web/public/navigation/navigation_manager.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/window_open_disposition.h"
using security_interstitials::omnibox_https_upgrades::Event;
diff --git a/ios/chrome/browser/intents/user_activity_browser_agent.mm b/ios/chrome/browser/intents/user_activity_browser_agent.mm
index 871518c..632f2e2 100644
--- a/ios/chrome/browser/intents/user_activity_browser_agent.mm
+++ b/ios/chrome/browser/intents/user_activity_browser_agent.mm
@@ -45,7 +45,7 @@
#import "ios/chrome/common/intents/OpenInChromeIncognitoIntent.h"
#import "ios/chrome/common/intents/OpenInChromeIntent.h"
#import "ios/chrome/common/intents/SearchInChromeIntent.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/page_transition_types.h"
using base::UserMetricsAction;
diff --git a/ios/chrome/browser/intents/user_activity_browser_agent_unittest.mm b/ios/chrome/browser/intents/user_activity_browser_agent_unittest.mm
index f780be0e6..79ea4a6 100644
--- a/ios/chrome/browser/intents/user_activity_browser_agent_unittest.mm
+++ b/ios/chrome/browser/intents/user_activity_browser_agent_unittest.mm
@@ -60,7 +60,7 @@
#import "ios/chrome/common/intents/SetChromeDefaultBrowserIntent.h"
#import "ios/chrome/common/intents/ViewHistoryIntent.h"
#import "ios/web/public/test/web_task_environment.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/test/gtest_util.h"
#import "testing/platform_test.h"
#import "third_party/ocmock/OCMock/OCMock.h"
diff --git a/ios/chrome/browser/itunes_urls/model/itunes_urls_handler_tab_helper.mm b/ios/chrome/browser/itunes_urls/model/itunes_urls_handler_tab_helper.mm
index 71671a6c..dd3d5648 100644
--- a/ios/chrome/browser/itunes_urls/model/itunes_urls_handler_tab_helper.mm
+++ b/ios/chrome/browser/itunes_urls/model/itunes_urls_handler_tab_helper.mm
@@ -19,7 +19,7 @@
#import "ios/web/public/navigation/navigation_item.h"
#import "ios/web/public/navigation/navigation_manager.h"
#import "ios/web/public/navigation/web_state_policy_decider.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/base/url_util.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/net/model/crurl.mm b/ios/chrome/browser/net/model/crurl.mm
index f5aa291..a2a113d 100644
--- a/ios/chrome/browser/net/model/crurl.mm
+++ b/ios/chrome/browser/net/model/crurl.mm
@@ -4,7 +4,7 @@
#import "ios/chrome/browser/net/model/crurl.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
@implementation CrURL {
// In an attempt to reduce the number of conversions to NSURL, we strive
diff --git a/ios/chrome/browser/passwords/model/password_controller_egtest.mm b/ios/chrome/browser/passwords/model/password_controller_egtest.mm
index c073b7a..0730b5f 100644
--- a/ios/chrome/browser/passwords/model/password_controller_egtest.mm
+++ b/ios/chrome/browser/passwords/model/password_controller_egtest.mm
@@ -30,7 +30,7 @@
#import "ios/chrome/test/earl_grey/web_http_server_chrome_test_case.h"
#import "ios/testing/earl_grey/earl_grey_test.h"
#import "ios/testing/earl_grey/matchers.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/test/embedded_test_server/default_handlers.h"
#import "ui/base/l10n/l10n_util.h"
diff --git a/ios/chrome/browser/passwords/model/password_manager_app_interface.mm b/ios/chrome/browser/passwords/model/password_manager_app_interface.mm
index d3894f1..b81587d 100644
--- a/ios/chrome/browser/passwords/model/password_manager_app_interface.mm
+++ b/ios/chrome/browser/passwords/model/password_manager_app_interface.mm
@@ -19,7 +19,7 @@
#import "ios/chrome/test/app/tab_test_util.h"
#import "ios/testing/nserror_util.h"
#import "ios/web/public/web_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "url/gurl.h"
using base::test::ios::kWaitForActionTimeout;
diff --git a/ios/chrome/browser/passwords/model/password_tab_helper.mm b/ios/chrome/browser/passwords/model/password_tab_helper.mm
index f952fd9..d57d8fd33 100644
--- a/ios/chrome/browser/passwords/model/password_tab_helper.mm
+++ b/ios/chrome/browser/passwords/model/password_tab_helper.mm
@@ -13,7 +13,7 @@
#import "ios/chrome/browser/passwords/model/password_controller.h"
#import "ios/chrome/browser/shared/public/commands/application_commands.h"
#import "ios/chrome/browser/shared/public/commands/command_dispatcher.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
PasswordTabHelper::~PasswordTabHelper() = default;
diff --git a/ios/chrome/browser/passwords/model/well_known_change_password_tab_helper.mm b/ios/chrome/browser/passwords/model/well_known_change_password_tab_helper.mm
index 4d406195..20c6f3b 100644
--- a/ios/chrome/browser/passwords/model/well_known_change_password_tab_helper.mm
+++ b/ios/chrome/browser/passwords/model/well_known_change_password_tab_helper.mm
@@ -13,7 +13,7 @@
#import "ios/chrome/browser/passwords/model/ios_chrome_affiliation_service_factory.h"
#import "ios/chrome/browser/shared/model/browser_state/chrome_browser_state.h"
#import "ios/web/public/navigation/navigation_context.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "services/metrics/public/cpp/ukm_builders.h"
#import "services/metrics/public/cpp/ukm_recorder.h"
#import "services/network/public/cpp/shared_url_loader_factory.h"
diff --git a/ios/chrome/browser/policy_url_blocking/model/policy_url_blocking_tab_helper.mm b/ios/chrome/browser/policy_url_blocking/model/policy_url_blocking_tab_helper.mm
index 3f5b7fb..ce236f0e 100644
--- a/ios/chrome/browser/policy_url_blocking/model/policy_url_blocking_tab_helper.mm
+++ b/ios/chrome/browser/policy_url_blocking/model/policy_url_blocking_tab_helper.mm
@@ -7,7 +7,7 @@
#import "components/policy/core/browser/url_blocklist_manager.h"
#import "ios/chrome/browser/policy_url_blocking/model/policy_url_blocking_service.h"
#import "ios/chrome/browser/policy_url_blocking/model/policy_url_blocking_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
PolicyUrlBlockingTabHelper::~PolicyUrlBlockingTabHelper() = default;
diff --git a/ios/chrome/browser/prerender/model/preload_controller.mm b/ios/chrome/browser/prerender/model/preload_controller.mm
index 323d30d..16a04e4 100644
--- a/ios/chrome/browser/prerender/model/preload_controller.mm
+++ b/ios/chrome/browser/prerender/model/preload_controller.mm
@@ -36,7 +36,7 @@
#import "ios/web/public/web_client.h"
#import "ios/web/public/web_state.h"
#import "ios/web/public/web_state_observer_bridge.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/page_transition_types.h"
using web::WebStatePolicyDecider;
diff --git a/ios/chrome/browser/reading_list/model/offline_page_tab_helper.mm b/ios/chrome/browser/reading_list/model/offline_page_tab_helper.mm
index ead8f84a..b39ca37 100644
--- a/ios/chrome/browser/reading_list/model/offline_page_tab_helper.mm
+++ b/ios/chrome/browser/reading_list/model/offline_page_tab_helper.mm
@@ -28,7 +28,7 @@
#import "ios/web/public/navigation/navigation_manager.h"
#import "ios/web/public/thread/web_task_traits.h"
#import "ios/web/public/thread/web_thread.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/page_transition_types.h"
namespace {
diff --git a/ios/chrome/browser/reading_list/model/reading_list_browser_agent.mm b/ios/chrome/browser/reading_list/model/reading_list_browser_agent.mm
index a68e553..24b27b02 100644
--- a/ios/chrome/browser/reading_list/model/reading_list_browser_agent.mm
+++ b/ios/chrome/browser/reading_list/model/reading_list_browser_agent.mm
@@ -27,7 +27,7 @@
#import "ios/chrome/browser/ui/ntp/metrics/home_metrics.h"
#import "ios/chrome/grit/ios_strings.h"
#import "ios/web/public/web_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "services/metrics/public/cpp/ukm_builders.h"
#import "ui/base/l10n/l10n_util.h"
diff --git a/ios/chrome/browser/reading_list/model/reading_list_distiller_page.mm b/ios/chrome/browser/reading_list/model/reading_list_distiller_page.mm
index f50ca71..0bf92ec 100644
--- a/ios/chrome/browser/reading_list/model/reading_list_distiller_page.mm
+++ b/ios/chrome/browser/reading_list/model/reading_list_distiller_page.mm
@@ -22,7 +22,7 @@
#import "ios/web/public/navigation/navigation_manager.h"
#import "ios/web/public/security/ssl_status.h"
#import "ios/web/public/web_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/cert/cert_status_flags.h"
#import "url/url_constants.h"
diff --git a/ios/chrome/browser/screen_time/model/screen_time_history_deleter.mm b/ios/chrome/browser/screen_time/model/screen_time_history_deleter.mm
index 78b5505a..52f08d4 100644
--- a/ios/chrome/browser/screen_time/model/screen_time_history_deleter.mm
+++ b/ios/chrome/browser/screen_time/model/screen_time_history_deleter.mm
@@ -8,7 +8,7 @@
#import "base/time/time.h"
#import "components/history/core/browser/history_service.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
namespace {
// Converts base::Time to NSDate.
diff --git a/ios/chrome/browser/send_tab_to_self/model/send_tab_to_self_browser_agent_unittest.mm b/ios/chrome/browser/send_tab_to_self/model/send_tab_to_self_browser_agent_unittest.mm
index 554b555..4825c50 100644
--- a/ios/chrome/browser/send_tab_to_self/model/send_tab_to_self_browser_agent_unittest.mm
+++ b/ios/chrome/browser/send_tab_to_self/model/send_tab_to_self_browser_agent_unittest.mm
@@ -23,7 +23,7 @@
#import "ios/web/public/test/fakes/fake_navigation_manager.h"
#import "ios/web/public/test/fakes/fake_web_state.h"
#import "ios/web/public/test/web_task_environment.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "testing/gtest_mac.h"
#import "testing/platform_test.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/settings/model/sync/utils/sync_fake_server_egtest.mm b/ios/chrome/browser/settings/model/sync/utils/sync_fake_server_egtest.mm
index 2b576d29..3dcda3f 100644
--- a/ios/chrome/browser/settings/model/sync/utils/sync_fake_server_egtest.mm
+++ b/ios/chrome/browser/settings/model/sync/utils/sync_fake_server_egtest.mm
@@ -33,7 +33,7 @@
#import "ios/testing/earl_grey/earl_grey_test.h"
#import "ios/web/public/test/http_server/http_server.h"
#import "ios/web/public/test/http_server/http_server_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/test/embedded_test_server/embedded_test_server.h"
#import "ui/base/l10n/l10n_util.h"
diff --git a/ios/chrome/browser/share_extension/model/share_extension_item_receiver.mm b/ios/chrome/browser/share_extension/model/share_extension_item_receiver.mm
index 0279fd8..44a0f3f 100644
--- a/ios/chrome/browser/share_extension/model/share_extension_item_receiver.mm
+++ b/ios/chrome/browser/share_extension/model/share_extension_item_receiver.mm
@@ -23,7 +23,7 @@
#import "ios/chrome/common/app_group/app_group_constants.h"
#import "ios/web/public/thread/web_task_traits.h"
#import "ios/web/public/thread/web_thread.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "url/gurl.h"
namespace {
diff --git a/ios/chrome/browser/shared/coordinator/scene/scene_controller.mm b/ios/chrome/browser/shared/coordinator/scene/scene_controller.mm
index 1e1b576..66b8da6 100644
--- a/ios/chrome/browser/shared/coordinator/scene/scene_controller.mm
+++ b/ios/chrome/browser/shared/coordinator/scene/scene_controller.mm
@@ -180,7 +180,7 @@
#import "ios/web/public/thread/web_task_traits.h"
#import "ios/web/public/thread/web_thread.h"
#import "ios/web/public/web_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
namespace {
diff --git a/ios/chrome/browser/shared/model/url/url_util_unittest.mm b/ios/chrome/browser/shared/model/url/url_util_unittest.mm
index e4d6c197..88af61e8 100644
--- a/ios/chrome/browser/shared/model/url/url_util_unittest.mm
+++ b/ios/chrome/browser/shared/model/url/url_util_unittest.mm
@@ -7,7 +7,7 @@
#import "base/strings/sys_string_conversions.h"
#import "ios/chrome/browser/shared/model/url/chrome_url_constants.h"
#import "ios/components/webui/web_ui_url_constants.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "testing/gtest_mac.h"
#import "testing/platform_test.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/shared/ui/table_view/cells/table_view_attributed_string_header_footer_item.mm b/ios/chrome/browser/shared/ui/table_view/cells/table_view_attributed_string_header_footer_item.mm
index 3b10c7a..5fed962 100644
--- a/ios/chrome/browser/shared/ui/table_view/cells/table_view_attributed_string_header_footer_item.mm
+++ b/ios/chrome/browser/shared/ui/table_view/cells/table_view_attributed_string_header_footer_item.mm
@@ -13,7 +13,7 @@
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"
#import "ios/chrome/common/ui/util/text_view_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
@implementation TableViewAttributedStringHeaderFooterItem
diff --git a/ios/chrome/browser/shared/ui/table_view/cells/table_view_link_header_footer_item.mm b/ios/chrome/browser/shared/ui/table_view/cells/table_view_link_header_footer_item.mm
index 7a8d287..6057108b 100644
--- a/ios/chrome/browser/shared/ui/table_view/cells/table_view_link_header_footer_item.mm
+++ b/ios/chrome/browser/shared/ui/table_view/cells/table_view_link_header_footer_item.mm
@@ -13,7 +13,7 @@
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"
#import "ios/chrome/common/ui/util/text_view_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
namespace {
diff --git a/ios/chrome/browser/shared/ui/table_view/cells/table_view_text_header_footer_item.mm b/ios/chrome/browser/shared/ui/table_view/cells/table_view_text_header_footer_item.mm
index a0288393..38abb5b 100644
--- a/ios/chrome/browser/shared/ui/table_view/cells/table_view_text_header_footer_item.mm
+++ b/ios/chrome/browser/shared/ui/table_view/cells/table_view_text_header_footer_item.mm
@@ -13,7 +13,7 @@
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"
#import "ios/chrome/common/ui/util/text_view_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
namespace {
diff --git a/ios/chrome/browser/shared/ui/table_view/cells/table_view_url_item_unittest.mm b/ios/chrome/browser/shared/ui/table_view/cells/table_view_url_item_unittest.mm
index 6d48578..4af9555a1 100644
--- a/ios/chrome/browser/shared/ui/table_view/cells/table_view_url_item_unittest.mm
+++ b/ios/chrome/browser/shared/ui/table_view/cells/table_view_url_item_unittest.mm
@@ -9,7 +9,7 @@
#import "components/url_formatter/elide_url.h"
#import "ios/chrome/browser/net/model/crurl.h"
#import "ios/chrome/browser/shared/ui/table_view/legacy_chrome_table_view_styler.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "testing/gtest/include/gtest/gtest.h"
#import "testing/gtest_mac.h"
#import "testing/platform_test.h"
diff --git a/ios/chrome/browser/shared/ui/util/pasteboard_util.mm b/ios/chrome/browser/shared/ui/util/pasteboard_util.mm
index 1ac6955..a6fa3b44c 100644
--- a/ios/chrome/browser/shared/ui/util/pasteboard_util.mm
+++ b/ios/chrome/browser/shared/ui/util/pasteboard_util.mm
@@ -12,7 +12,7 @@
#import "components/open_from_clipboard/clipboard_async_wrapper_ios.h"
#import "ios/chrome/browser/shared/public/features/features.h"
#import "ios/chrome/browser/shared/ui/util/image/image_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "url/gurl.h"
void StoreURLInPasteboard(const GURL& url) {
diff --git a/ios/chrome/browser/signin/model/gaia_auth_fetcher_ios_bridge.mm b/ios/chrome/browser/signin/model/gaia_auth_fetcher_ios_bridge.mm
index 98456d1..41ca325 100644
--- a/ios/chrome/browser/signin/model/gaia_auth_fetcher_ios_bridge.mm
+++ b/ios/chrome/browser/signin/model/gaia_auth_fetcher_ios_bridge.mm
@@ -7,7 +7,7 @@
#import <Foundation/Foundation.h>
#import "base/strings/sys_string_conversions.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/http/http_request_headers.h"
#pragma mark - GaiaAuthFetcherIOSBridge::GaiaAuthFetcherIOSBridgeDelegate
diff --git a/ios/chrome/browser/signin/model/gaia_auth_fetcher_ios_ns_url_session_bridge.mm b/ios/chrome/browser/signin/model/gaia_auth_fetcher_ios_ns_url_session_bridge.mm
index 333b5bd..d3cb232 100644
--- a/ios/chrome/browser/signin/model/gaia_auth_fetcher_ios_ns_url_session_bridge.mm
+++ b/ios/chrome/browser/signin/model/gaia_auth_fetcher_ios_ns_url_session_bridge.mm
@@ -14,7 +14,7 @@
#import "ios/net/cookies/system_cookie_util.h"
#import "ios/web/public/browser_state.h"
#import "ios/web/public/web_client.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/http/http_request_headers.h"
#pragma mark - GaiaAuthFetcherIOSNSURLSessionBridge::Request
diff --git a/ios/chrome/browser/signin/model/gaia_auth_fetcher_ios_ns_url_session_bridge_unittests.mm b/ios/chrome/browser/signin/model/gaia_auth_fetcher_ios_ns_url_session_bridge_unittests.mm
index 6a536cc9..c2cb64c 100644
--- a/ios/chrome/browser/signin/model/gaia_auth_fetcher_ios_ns_url_session_bridge_unittests.mm
+++ b/ios/chrome/browser/signin/model/gaia_auth_fetcher_ios_ns_url_session_bridge_unittests.mm
@@ -19,7 +19,7 @@
#import "ios/web/public/test/scoped_testing_web_client.h"
#import "ios/web/public/test/web_state_test_util.h"
#import "ios/web/public/test/web_task_environment.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/base/net_errors.h"
#import "net/cookies/cookie_access_result.h"
#import "net/cookies/cookie_store.h"
diff --git a/ios/chrome/browser/supervised_user/model/supervised_user_url_filter_tab_helper.mm b/ios/chrome/browser/supervised_user/model/supervised_user_url_filter_tab_helper.mm
index 2c341a0a..b7b09e2 100644
--- a/ios/chrome/browser/supervised_user/model/supervised_user_url_filter_tab_helper.mm
+++ b/ios/chrome/browser/supervised_user/model/supervised_user_url_filter_tab_helper.mm
@@ -21,7 +21,7 @@
#import "ios/chrome/browser/supervised_user/model/supervised_user_error_container.h"
#import "ios/chrome/browser/supervised_user/model/supervised_user_service_factory.h"
#import "ios/net/protocol_handler_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/base/net_errors.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/supervised_user/model/supervised_user_with_parental_controls_egtest.mm b/ios/chrome/browser/supervised_user/model/supervised_user_with_parental_controls_egtest.mm
index 24167d4..2fb8eab 100644
--- a/ios/chrome/browser/supervised_user/model/supervised_user_with_parental_controls_egtest.mm
+++ b/ios/chrome/browser/supervised_user/model/supervised_user_with_parental_controls_egtest.mm
@@ -28,7 +28,7 @@
#import "ios/testing/earl_grey/app_launch_manager.h"
#import "ios/testing/earl_grey/earl_grey_test.h"
#import "ios/testing/earl_grey/matchers.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/test/embedded_test_server/embedded_test_server.h"
#import "ui/base/l10n/l10n_util.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_coordinator_egtest.mm b/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_coordinator_egtest.mm
index 9d94275..cbe7a69 100644
--- a/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_coordinator_egtest.mm
+++ b/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_coordinator_egtest.mm
@@ -18,7 +18,7 @@
#import "ios/chrome/test/earl_grey/chrome_matchers.h"
#import "ios/chrome/test/earl_grey/chrome_test_case.h"
#import "ios/testing/earl_grey/earl_grey_test.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/test/embedded_test_server/embedded_test_server.h"
// ConsistencyPromoSigninCoordinator EarlGrey tests.
diff --git a/ios/chrome/browser/ui/authentication/signin/forced_signin/forced_signin_egtest.mm b/ios/chrome/browser/ui/authentication/signin/forced_signin/forced_signin_egtest.mm
index 261abebb..a94ea49 100644
--- a/ios/chrome/browser/ui/authentication/signin/forced_signin/forced_signin_egtest.mm
+++ b/ios/chrome/browser/ui/authentication/signin/forced_signin/forced_signin_egtest.mm
@@ -40,7 +40,7 @@
#import "ios/testing/earl_grey/app_launch_manager.h"
#import "ios/testing/earl_grey/base_eg_test_helper_impl.h"
#import "ios/testing/earl_grey/earl_grey_test.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/test/embedded_test_server/embedded_test_server.h"
#import "net/test/embedded_test_server/http_request.h"
#import "net/test/embedded_test_server/http_response.h"
diff --git a/ios/chrome/browser/ui/authentication/signin_earl_grey_app_interface.mm b/ios/chrome/browser/ui/authentication/signin_earl_grey_app_interface.mm
index 307b884..62f12ef 100644
--- a/ios/chrome/browser/ui/authentication/signin_earl_grey_app_interface.mm
+++ b/ios/chrome/browser/ui/authentication/signin_earl_grey_app_interface.mm
@@ -40,7 +40,7 @@
#import "ios/chrome/browser/ui/authentication/cells/table_view_identity_cell.h"
#import "ios/chrome/test/app/chrome_test_util.h"
#import "ios/testing/earl_grey/earl_grey_app.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "url/gurl.h"
@implementation SigninEarlGreyAppInterface
diff --git a/ios/chrome/browser/ui/authentication/tangible_sync/tangible_sync_view_controller.mm b/ios/chrome/browser/ui/authentication/tangible_sync/tangible_sync_view_controller.mm
index ca8207f..ed805067 100644
--- a/ios/chrome/browser/ui/authentication/tangible_sync/tangible_sync_view_controller.mm
+++ b/ios/chrome/browser/ui/authentication/tangible_sync/tangible_sync_view_controller.mm
@@ -14,7 +14,7 @@
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/ui/authentication/unified_consent/unified_consent_view_controller.mm b/ios/chrome/browser/ui/authentication/unified_consent/unified_consent_view_controller.mm
index 336c7dd..143c4be 100644
--- a/ios/chrome/browser/ui/authentication/unified_consent/unified_consent_view_controller.mm
+++ b/ios/chrome/browser/ui/authentication/unified_consent/unified_consent_view_controller.mm
@@ -24,7 +24,7 @@
#import "ios/chrome/common/ui/util/text_view_util.h"
#import "ios/chrome/grit/ios_branded_strings.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util_mac.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/ui/autofill/form_input_accessory/form_input_accessory_egtest.mm b/ios/chrome/browser/ui/autofill/form_input_accessory/form_input_accessory_egtest.mm
index a2265cb..63f5533 100644
--- a/ios/chrome/browser/ui/autofill/form_input_accessory/form_input_accessory_egtest.mm
+++ b/ios/chrome/browser/ui/autofill/form_input_accessory/form_input_accessory_egtest.mm
@@ -24,7 +24,7 @@
#import "ios/chrome/test/earl_grey/web_http_server_chrome_test_case.h"
#import "ios/testing/earl_grey/earl_grey_test.h"
#import "ios/testing/earl_grey/matchers.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/test/embedded_test_server/default_handlers.h"
#import "ui/base/l10n/l10n_util.h"
#import "ui/base/l10n/l10n_util_mac.h"
diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_mediator.mm b/ios/chrome/browser/ui/bookmarks/bookmark_mediator.mm
index 7d6721c..e5dead6 100644
--- a/ios/chrome/browser/ui/bookmarks/bookmark_mediator.mm
+++ b/ios/chrome/browser/ui/bookmarks/bookmark_mediator.mm
@@ -30,7 +30,7 @@
#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h"
#import "ios/chrome/browser/ui/ntp/metrics/home_metrics.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
using bookmarks::BookmarkModel;
diff --git a/ios/chrome/browser/ui/browser_view/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view/browser_view_controller.mm
index da7aa3d..8cd1447 100644
--- a/ios/chrome/browser/ui/browser_view/browser_view_controller.mm
+++ b/ios/chrome/browser/ui/browser_view/browser_view_controller.mm
@@ -92,7 +92,7 @@
#import "ios/web/public/ui/crw_web_view_proxy.h"
#import "ios/web/public/ui/crw_web_view_scroll_view_proxy.h"
#import "ios/web/public/web_state_observer_bridge.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "services/metrics/public/cpp/ukm_builders.h"
#import "ui/base/device_form_factor.h"
#import "ui/base/l10n/l10n_util.h"
diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_egtest.mm b/ios/chrome/browser/ui/content_suggestions/content_suggestions_egtest.mm
index 06f7ca44..49983a2 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_egtest.mm
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_egtest.mm
@@ -40,7 +40,7 @@
#import "ios/chrome/test/earl_grey/chrome_test_case.h"
#import "ios/testing/earl_grey/app_launch_manager.h"
#import "ios/testing/earl_grey/earl_grey_test.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/test/embedded_test_server/embedded_test_server.h"
#import "net/test/embedded_test_server/http_request.h"
#import "net/test/embedded_test_server/http_response.h"
diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_tile_saver.mm b/ios/chrome/browser/ui/content_suggestions/content_suggestions_tile_saver.mm
index a77adb4..0f78a08 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_tile_saver.mm
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_tile_saver.mm
@@ -18,7 +18,7 @@
#import "ios/chrome/common/app_group/app_group_constants.h"
#import "ios/chrome/common/ntp_tile/ntp_tile.h"
#import "ios/chrome/common/ui/favicon/favicon_attributes.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#if BUILDFLAG(ENABLE_WIDGET_KIT_EXTENSION)
#import "ios/chrome/browser/widget_kit/model/model_swift.h"
diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_tile_saver_unittest.mm b/ios/chrome/browser/ui/content_suggestions/content_suggestions_tile_saver_unittest.mm
index c7c1f5a..81cad96 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_tile_saver_unittest.mm
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_tile_saver_unittest.mm
@@ -14,7 +14,7 @@
#import "ios/chrome/common/ntp_tile/ntp_tile.h"
#import "ios/chrome/common/ui/favicon/favicon_attributes.h"
#import "ios/chrome/test/block_cleanup_test.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "testing/gtest_mac.h"
#import "third_party/ocmock/OCMock/OCMock.h"
#import "ui/base/test/ios/ui_image_test_utils.h"
diff --git a/ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interface.mm b/ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interface.mm
index 065dc04..6b8f0ca 100644
--- a/ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interface.mm
+++ b/ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interface.mm
@@ -21,7 +21,7 @@
#import "ios/chrome/browser/ui/content_suggestions/set_up_list/constants.h"
#import "ios/chrome/browser/ui/content_suggestions/set_up_list/set_up_list_item_view.h"
#import "ios/chrome/test/app/chrome_test_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
using content_suggestions::SearchFieldWidth;
using set_up_list_prefs::SetUpListItemState;
diff --git a/ios/chrome/browser/ui/context_menu/context_menu_utils_unittest.mm b/ios/chrome/browser/ui/context_menu/context_menu_utils_unittest.mm
index 027db3b..039d3c9 100644
--- a/ios/chrome/browser/ui/context_menu/context_menu_utils_unittest.mm
+++ b/ios/chrome/browser/ui/context_menu/context_menu_utils_unittest.mm
@@ -11,7 +11,7 @@
#import "ios/web/common/features.h"
#import "ios/web/common/referrer_util.h"
#import "ios/web/public/ui/context_menu_params.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "testing/gtest/include/gtest/gtest.h"
#import "testing/gtest_mac.h"
#import "testing/platform_test.h"
diff --git a/ios/chrome/browser/ui/first_run/tos/tos_coordinator.mm b/ios/chrome/browser/ui/first_run/tos/tos_coordinator.mm
index cdc73a8..df70e1b 100644
--- a/ios/chrome/browser/ui/first_run/tos/tos_coordinator.mm
+++ b/ios/chrome/browser/ui/first_run/tos/tos_coordinator.mm
@@ -18,7 +18,7 @@
#import "ios/chrome/browser/ui/first_run/tos/tos_view_controller.h"
#import "ios/chrome/grit/ios_strings.h"
#import "ios/web/common/web_view_creation_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
@interface TOSCoordinator () <UIAdaptivePresentationControllerDelegate,
diff --git a/ios/chrome/browser/ui/follow/first_follow_coordinator.mm b/ios/chrome/browser/ui/follow/first_follow_coordinator.mm
index 2f639ae..9e834a9 100644
--- a/ios/chrome/browser/ui/follow/first_follow_coordinator.mm
+++ b/ios/chrome/browser/ui/follow/first_follow_coordinator.mm
@@ -19,7 +19,7 @@
#import "ios/chrome/common/ui/confirmation_alert/confirmation_alert_action_handler.h"
#import "ios/chrome/common/ui/favicon/favicon_attributes.h"
#import "ios/chrome/common/ui/favicon/favicon_constants.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
namespace {
diff --git a/ios/chrome/browser/ui/history/history_ui_egtest.mm b/ios/chrome/browser/ui/history/history_ui_egtest.mm
index c133e75..be54c09 100644
--- a/ios/chrome/browser/ui/history/history_ui_egtest.mm
+++ b/ios/chrome/browser/ui/history/history_ui_egtest.mm
@@ -27,7 +27,7 @@
#import "ios/chrome/test/earl_grey/chrome_matchers.h"
#import "ios/chrome/test/earl_grey/chrome_test_case.h"
#import "ios/testing/earl_grey/earl_grey_test.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/test/embedded_test_server/embedded_test_server.h"
#import "net/test/embedded_test_server/http_request.h"
#import "net/test/embedded_test_server/http_response.h"
diff --git a/ios/chrome/browser/ui/lens/lens_coordinator.mm b/ios/chrome/browser/ui/lens/lens_coordinator.mm
index b50de9f..ae3c407 100644
--- a/ios/chrome/browser/ui/lens/lens_coordinator.mm
+++ b/ios/chrome/browser/ui/lens/lens_coordinator.mm
@@ -46,7 +46,7 @@
#import "ios/web/public/navigation/navigation_manager.h"
#import "ios/web/public/web_state.h"
#import "ios/web/public/web_state_observer_bridge.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/device_form_factor.h"
#import "ui/base/l10n/l10n_util_mac.h"
diff --git a/ios/chrome/browser/ui/link_to_text/link_to_text_egtest.mm b/ios/chrome/browser/ui/link_to_text/link_to_text_egtest.mm
index c7f3ec85..338bc70 100644
--- a/ios/chrome/browser/ui/link_to_text/link_to_text_egtest.mm
+++ b/ios/chrome/browser/ui/link_to_text/link_to_text_egtest.mm
@@ -23,7 +23,7 @@
#import "ios/testing/earl_grey/earl_grey_test.h"
#import "ios/web/common/features.h"
#import "ios/web/public/test/element_selector.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/test/embedded_test_server/default_handlers.h"
#import "net/test/embedded_test_server/http_request.h"
#import "net/test/embedded_test_server/http_response.h"
diff --git a/ios/chrome/browser/ui/mini_map/mini_map_coordinator.mm b/ios/chrome/browser/ui/mini_map/mini_map_coordinator.mm
index 64e1be2..d84355bf 100644
--- a/ios/chrome/browser/ui/mini_map/mini_map_coordinator.mm
+++ b/ios/chrome/browser/ui/mini_map/mini_map_coordinator.mm
@@ -22,7 +22,7 @@
#import "ios/chrome/grit/ios_strings.h"
#import "ios/public/provider/chrome/browser/mini_map/mini_map_api.h"
#import "ios/web/public/web_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
@interface MiniMapCoordinator () <MiniMapActionHandler, MiniMapMediatorDelegate>
diff --git a/ios/chrome/browser/ui/mini_map/mini_map_interstitial_view_controller.mm b/ios/chrome/browser/ui/mini_map/mini_map_interstitial_view_controller.mm
index 14e1efd..ebfdb982 100644
--- a/ios/chrome/browser/ui/mini_map/mini_map_interstitial_view_controller.mm
+++ b/ios/chrome/browser/ui/mini_map/mini_map_interstitial_view_controller.mm
@@ -13,7 +13,7 @@
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/chrome/grit/ios_branded_strings.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/ui/ntp/incognito/incognito_view.mm b/ios/chrome/browser/ui/ntp/incognito/incognito_view.mm
index a8b6dde..a76b7b8 100644
--- a/ios/chrome/browser/ui/ntp/incognito/incognito_view.mm
+++ b/ios/chrome/browser/ui/ntp/incognito/incognito_view.mm
@@ -22,7 +22,7 @@
#import "ios/chrome/grit/ios_strings.h"
#import "ios/web/public/navigation/navigation_manager.h"
#import "ios/web/public/navigation/referrer.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/ui/ntp/incognito/revamped_incognito_view.mm b/ios/chrome/browser/ui/ntp/incognito/revamped_incognito_view.mm
index 05ad487..033cd6f 100644
--- a/ios/chrome/browser/ui/ntp/incognito/revamped_incognito_view.mm
+++ b/ios/chrome/browser/ui/ntp/incognito/revamped_incognito_view.mm
@@ -21,7 +21,7 @@
#import "ios/chrome/common/ui/util/text_view_util.h"
#import "ios/web/public/navigation/navigation_manager.h"
#import "ios/web/public/navigation/referrer.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
namespace {
diff --git a/ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm b/ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm
index 61d47a0..1aef2bf 100644
--- a/ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm
+++ b/ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm
@@ -41,7 +41,7 @@
#import "ios/chrome/grit/ios_strings.h"
#import "ios/chrome/grit/ios_theme_resources.h"
#import "ios/web/public/navigation/referrer.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/device_form_factor.h"
#import "ui/base/page_transition_types.h"
#import "ui/base/resource/resource_bundle.h"
diff --git a/ios/chrome/browser/ui/parcel_tracking/parcel_tracking_opt_in_view_controller.mm b/ios/chrome/browser/ui/parcel_tracking/parcel_tracking_opt_in_view_controller.mm
index 2666ea11..4f1a610 100644
--- a/ios/chrome/browser/ui/parcel_tracking/parcel_tracking_opt_in_view_controller.mm
+++ b/ios/chrome/browser/ui/parcel_tracking/parcel_tracking_opt_in_view_controller.mm
@@ -15,7 +15,7 @@
#import "ios/chrome/common/ui/util/ui_util.h"
#import "ios/chrome/grit/ios_branded_strings.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util_mac.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/ui/passwords/bottom_sheet/password_suggestion_bottom_sheet_egtest.mm b/ios/chrome/browser/ui/passwords/bottom_sheet/password_suggestion_bottom_sheet_egtest.mm
index 343d4e0..b1d7caf 100644
--- a/ios/chrome/browser/ui/passwords/bottom_sheet/password_suggestion_bottom_sheet_egtest.mm
+++ b/ios/chrome/browser/ui/passwords/bottom_sheet/password_suggestion_bottom_sheet_egtest.mm
@@ -31,7 +31,7 @@
#import "ios/chrome/test/scoped_eg_traits_overrider.h"
#import "ios/testing/earl_grey/earl_grey_test.h"
#import "ios/testing/earl_grey/matchers.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/test/embedded_test_server/default_handlers.h"
#import "ui/base/l10n/l10n_util.h"
diff --git a/ios/chrome/browser/ui/price_notifications/price_notifications_table_view_controller.mm b/ios/chrome/browser/ui/price_notifications/price_notifications_table_view_controller.mm
index b7385fc4..da6d65f2 100644
--- a/ios/chrome/browser/ui/price_notifications/price_notifications_table_view_controller.mm
+++ b/ios/chrome/browser/ui/price_notifications/price_notifications_table_view_controller.mm
@@ -25,7 +25,7 @@
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/chrome/common/ui/util/text_view_util.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util_mac.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/ui/qr_scanner/qr_scanner_app_interface.mm b/ios/chrome/browser/ui/qr_scanner/qr_scanner_app_interface.mm
index 0c9c431..c27cd31c 100644
--- a/ios/chrome/browser/ui/qr_scanner/qr_scanner_app_interface.mm
+++ b/ios/chrome/browser/ui/qr_scanner/qr_scanner_app_interface.mm
@@ -25,7 +25,7 @@
#import "ios/chrome/grit/ios_strings.h"
#import "ios/chrome/test/app/chrome_test_util.h"
#import "ios/testing/nserror_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "third_party/ocmock/OCMock/OCMock.h"
#import "ui/base/l10n/l10n_util.h"
#import "ui/base/l10n/l10n_util_mac.h"
diff --git a/ios/chrome/browser/ui/qr_scanner/qr_scanner_view_controller_egtest.mm b/ios/chrome/browser/ui/qr_scanner/qr_scanner_view_controller_egtest.mm
index 4cc6d14..6482604 100644
--- a/ios/chrome/browser/ui/qr_scanner/qr_scanner_view_controller_egtest.mm
+++ b/ios/chrome/browser/ui/qr_scanner/qr_scanner_view_controller_egtest.mm
@@ -16,7 +16,7 @@
#import "ios/chrome/test/earl_grey/chrome_test_case.h"
#import "ios/chrome/test/earl_grey/earl_grey_scoped_block_swizzler.h"
#import "ios/testing/earl_grey/earl_grey_test.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/base/url_util.h"
#import "net/test/embedded_test_server/embedded_test_server.h"
#import "net/test/embedded_test_server/http_request.h"
diff --git a/ios/chrome/browser/ui/reading_list/reading_list_app_interface.mm b/ios/chrome/browser/ui/reading_list/reading_list_app_interface.mm
index 0e04e8a5..4d9460c 100644
--- a/ios/chrome/browser/ui/reading_list/reading_list_app_interface.mm
+++ b/ios/chrome/browser/ui/reading_list/reading_list_app_interface.mm
@@ -13,7 +13,7 @@
#import "ios/chrome/test/app/chrome_test_util.h"
#import "ios/chrome/test/app/tab_test_util.h"
#import "ios/testing/nserror_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/base/network_change_notifier.h"
namespace {
diff --git a/ios/chrome/browser/ui/sad_tab/sad_tab_view.mm b/ios/chrome/browser/ui/sad_tab/sad_tab_view.mm
index b927f85..d34c334 100644
--- a/ios/chrome/browser/ui/sad_tab/sad_tab_view.mm
+++ b/ios/chrome/browser/ui/sad_tab/sad_tab_view.mm
@@ -19,7 +19,7 @@
#import "ios/chrome/common/ui/util/ui_util.h"
#import "ios/web/public/browser_state.h"
#import "ios/web/public/navigation/navigation_manager.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/device_form_factor.h"
#import "ui/base/l10n/l10n_util.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/ui/screen_time/screen_time_mediator.mm b/ios/chrome/browser/ui/screen_time/screen_time_mediator.mm
index db6f396b..ebb60752 100644
--- a/ios/chrome/browser/ui/screen_time/screen_time_mediator.mm
+++ b/ios/chrome/browser/ui/screen_time/screen_time_mediator.mm
@@ -11,7 +11,7 @@
#import "ios/chrome/browser/ui/screen_time/screen_time_consumer.h"
#import "ios/web/public/web_state.h"
#import "ios/web/public/web_state_observer_bridge.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
@interface ScreenTimeMediator () <WebStateListObserving, CRWWebStateObserver> {
std::unique_ptr<WebStateListObserver> _webStateListObserver;
diff --git a/ios/chrome/browser/ui/search_engine_choice/search_engine_choice_view_controller.mm b/ios/chrome/browser/ui/search_engine_choice/search_engine_choice_view_controller.mm
index 5ce1f5a..2cd66ab 100644
--- a/ios/chrome/browser/ui/search_engine_choice/search_engine_choice_view_controller.mm
+++ b/ios/chrome/browser/ui/search_engine_choice/search_engine_choice_view_controller.mm
@@ -19,7 +19,7 @@
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/chrome/common/ui/util/device_util.h"
#import "ios/chrome/common/ui/util/sdk_forward_declares.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/device_form_factor.h"
#import "ui/base/l10n/l10n_util_mac.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/ui/settings/autofill/autofill_credit_card_table_view_controller.mm b/ios/chrome/browser/ui/settings/autofill/autofill_credit_card_table_view_controller.mm
index a8f53631..5cf6d86 100644
--- a/ios/chrome/browser/ui/settings/autofill/autofill_credit_card_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/autofill/autofill_credit_card_table_view_controller.mm
@@ -45,7 +45,7 @@
#import "ios/chrome/common/ui/reauthentication/reauthentication_protocol.h"
#import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
namespace {
diff --git a/ios/chrome/browser/ui/settings/autofill/autofill_profile_table_view_controller.mm b/ios/chrome/browser/ui/settings/autofill/autofill_profile_table_view_controller.mm
index e787bfe..c38aa73b 100644
--- a/ios/chrome/browser/ui/settings/autofill/autofill_profile_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/autofill/autofill_profile_table_view_controller.mm
@@ -49,7 +49,7 @@
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
#import "ui/strings/grit/ui_strings.h"
diff --git a/ios/chrome/browser/ui/settings/cells/legacy_settings_search_engine_item_unittest.mm b/ios/chrome/browser/ui/settings/cells/legacy_settings_search_engine_item_unittest.mm
index 0ae9df5..99f7b79e 100644
--- a/ios/chrome/browser/ui/settings/cells/legacy_settings_search_engine_item_unittest.mm
+++ b/ios/chrome/browser/ui/settings/cells/legacy_settings_search_engine_item_unittest.mm
@@ -8,7 +8,7 @@
#import "ios/chrome/browser/shared/public/features/features.h"
#import "ios/chrome/browser/shared/ui/table_view/cells/table_view_url_item.h"
#import "ios/chrome/browser/shared/ui/table_view/legacy_chrome_table_view_styler.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "testing/gtest/include/gtest/gtest.h"
#import "testing/gtest_mac.h"
#import "testing/platform_test.h"
diff --git a/ios/chrome/browser/ui/settings/content_settings/block_popups_table_view_controller.mm b/ios/chrome/browser/ui/settings/content_settings/block_popups_table_view_controller.mm
index 11d23be..15d96d5 100644
--- a/ios/chrome/browser/ui/settings/content_settings/block_popups_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/content_settings/block_popups_table_view_controller.mm
@@ -28,7 +28,7 @@
#import "ios/chrome/browser/ui/settings/settings_navigation_controller.h"
#import "ios/chrome/browser/ui/settings/utils/content_setting_backed_boolean.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
#import "ui/base/l10n/l10n_util_mac.h"
diff --git a/ios/chrome/browser/ui/settings/google_services/accounts_table_view_controller.mm b/ios/chrome/browser/ui/settings/google_services/accounts_table_view_controller.mm
index e0f559e..33ded4d 100644
--- a/ios/chrome/browser/ui/settings/google_services/accounts_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/google_services/accounts_table_view_controller.mm
@@ -64,7 +64,7 @@
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/grit/ios_branded_strings.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util_mac.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/ui/settings/google_services/google_services_settings_view_controller.mm b/ios/chrome/browser/ui/settings/google_services/google_services_settings_view_controller.mm
index 952aac9b..3cdf812d 100644
--- a/ios/chrome/browser/ui/settings/google_services/google_services_settings_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/google_services/google_services_settings_view_controller.mm
@@ -19,7 +19,7 @@
#import "ios/chrome/browser/ui/settings/google_services/google_services_settings_view_controller_model_delegate.h"
#import "ios/chrome/grit/ios_branded_strings.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util_mac.h"
@interface GoogleServicesSettingsViewController () <
diff --git a/ios/chrome/browser/ui/settings/google_services/manage_sync_settings_coordinator.mm b/ios/chrome/browser/ui/settings/google_services/manage_sync_settings_coordinator.mm
index 3449763..b170be2 100644
--- a/ios/chrome/browser/ui/settings/google_services/manage_sync_settings_coordinator.mm
+++ b/ios/chrome/browser/ui/settings/google_services/manage_sync_settings_coordinator.mm
@@ -52,7 +52,7 @@
#import "ios/chrome/browser/ui/settings/sync/sync_encryption_passphrase_table_view_controller.h"
#import "ios/chrome/browser/ui/settings/sync/sync_encryption_table_view_controller.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
using signin_metrics::AccessPoint;
diff --git a/ios/chrome/browser/ui/settings/google_services/manage_sync_settings_table_view_controller.mm b/ios/chrome/browser/ui/settings/google_services/manage_sync_settings_table_view_controller.mm
index d247198..3823b679 100644
--- a/ios/chrome/browser/ui/settings/google_services/manage_sync_settings_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/google_services/manage_sync_settings_table_view_controller.mm
@@ -17,7 +17,7 @@
#import "ios/chrome/browser/ui/settings/google_services/manage_sync_settings_table_view_controller_model_delegate.h"
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
namespace {
diff --git a/ios/chrome/browser/ui/settings/language/language_settings_table_view_controller.mm b/ios/chrome/browser/ui/settings/language/language_settings_table_view_controller.mm
index ed6c167..56a1f38 100644
--- a/ios/chrome/browser/ui/settings/language/language_settings_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/language/language_settings_table_view_controller.mm
@@ -37,7 +37,7 @@
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util_mac.h"
namespace {
diff --git a/ios/chrome/browser/ui/settings/password/password_details/add_password_mediator.mm b/ios/chrome/browser/ui/settings/password/password_details/add_password_mediator.mm
index 19f372a..238579d6 100644
--- a/ios/chrome/browser/ui/settings/password/password_details/add_password_mediator.mm
+++ b/ios/chrome/browser/ui/settings/password/password_details/add_password_mediator.mm
@@ -25,7 +25,7 @@
#import "ios/chrome/browser/ui/settings/password/password_details/add_password_details_consumer.h"
#import "ios/chrome/browser/ui/settings/password/password_details/add_password_mediator_delegate.h"
#import "ios/chrome/browser/ui/settings/password/password_details/add_password_view_controller_delegate.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
using base::SysNSStringToUTF8;
using base::SysNSStringToUTF16;
diff --git a/ios/chrome/browser/ui/settings/password/password_manager_view_controller.mm b/ios/chrome/browser/ui/settings/password/password_manager_view_controller.mm
index faa43ffc..dfe3f235 100644
--- a/ios/chrome/browser/ui/settings/password/password_manager_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/password/password_manager_view_controller.mm
@@ -79,7 +79,7 @@
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/chrome/grit/ios_branded_strings.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/device_form_factor.h"
#import "ui/base/l10n/l10n_util.h"
#import "ui/base/l10n/l10n_util_mac.h"
diff --git a/ios/chrome/browser/ui/settings/password/password_settings/password_settings_coordinator.mm b/ios/chrome/browser/ui/settings/password/password_settings/password_settings_coordinator.mm
index 5519ef3..74b82582 100644
--- a/ios/chrome/browser/ui/settings/password/password_settings/password_settings_coordinator.mm
+++ b/ios/chrome/browser/ui/settings/password/password_settings/password_settings_coordinator.mm
@@ -46,7 +46,7 @@
#import "ios/chrome/common/ui/reauthentication/reauthentication_module.h"
#import "ios/chrome/grit/ios_branded_strings.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
#import "ui/base/l10n/l10n_util_mac.h"
diff --git a/ios/chrome/browser/ui/settings/password/passwords_mediator.mm b/ios/chrome/browser/ui/settings/password/passwords_mediator.mm
index a06ceb07..653f9bf 100644
--- a/ios/chrome/browser/ui/settings/password/passwords_mediator.mm
+++ b/ios/chrome/browser/ui/settings/password/passwords_mediator.mm
@@ -32,7 +32,7 @@
#import "ios/chrome/common/ui/favicon/favicon_constants.h"
#import "ios/chrome/grit/ios_branded_strings.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util_mac.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/ui/settings/privacy/privacy_safe_browsing_view_controller.mm b/ios/chrome/browser/ui/settings/privacy/privacy_safe_browsing_view_controller.mm
index 9ca2512..687f85b6 100644
--- a/ios/chrome/browser/ui/settings/privacy/privacy_safe_browsing_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/privacy/privacy_safe_browsing_view_controller.mm
@@ -17,7 +17,7 @@
#import "ios/chrome/browser/ui/settings/privacy/privacy_safe_browsing_view_controller_delegate.h"
#import "ios/chrome/grit/ios_branded_strings.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util_mac.h"
using ItemArray = NSArray<TableViewItem*>*;
diff --git a/ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_enhanced_protection_view_controller.mm b/ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_enhanced_protection_view_controller.mm
index 933ca81..f4227db 100644
--- a/ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_enhanced_protection_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_enhanced_protection_view_controller.mm
@@ -24,7 +24,7 @@
#import "ios/chrome/common/ui/colors/semantic_color_names.h"
#import "ios/chrome/grit/ios_branded_strings.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util_mac.h"
using ItemArray = NSArray<TableViewItem*>*;
diff --git a/ios/chrome/browser/ui/settings/safety_check/safety_check_coordinator.mm b/ios/chrome/browser/ui/settings/safety_check/safety_check_coordinator.mm
index 19a8c9b..c9b1cc0d 100644
--- a/ios/chrome/browser/ui/settings/safety_check/safety_check_coordinator.mm
+++ b/ios/chrome/browser/ui/settings/safety_check/safety_check_coordinator.mm
@@ -35,7 +35,7 @@
#import "ios/chrome/browser/ui/settings/safety_check/safety_check_ui_swift.h"
#import "ios/chrome/browser/ui/settings/settings_navigation_controller.h"
#import "ios/chrome/common/ui/elements/popover_label_view_controller.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "url/gurl.h"
using password_manager::WarningType;
diff --git a/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm b/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm
index e707162..c914fa5a 100644
--- a/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm
+++ b/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm
@@ -57,7 +57,7 @@
#import "ios/chrome/grit/ios_branded_strings.h"
#import "ios/chrome/grit/ios_strings.h"
#import "ios/web/common/url_scheme_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "services/network/public/cpp/shared_url_loader_factory.h"
#import "ui/base/l10n/l10n_util.h"
#import "ui/base/l10n/time_format.h"
diff --git a/ios/chrome/browser/ui/settings/search_engine_table_view_controller.mm b/ios/chrome/browser/ui/settings/search_engine_table_view_controller.mm
index 12150cb..af7de10 100644
--- a/ios/chrome/browser/ui/settings/search_engine_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/search_engine_table_view_controller.mm
@@ -37,7 +37,7 @@
#import "ios/chrome/common/ui/favicon/favicon_constants.h"
#import "ios/chrome/common/ui/favicon/favicon_view.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util_mac.h"
namespace {
diff --git a/ios/chrome/browser/ui/settings/settings_table_view_controller.mm b/ios/chrome/browser/ui/settings/settings_table_view_controller.mm
index bb6937d..5925e80 100644
--- a/ios/chrome/browser/ui/settings/settings_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/settings_table_view_controller.mm
@@ -138,7 +138,7 @@
#import "ios/chrome/grit/ios_branded_strings.h"
#import "ios/chrome/grit/ios_strings.h"
#import "ios/public/provider/chrome/browser/signin/signin_resources_api.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util_mac.h"
namespace {
diff --git a/ios/chrome/browser/ui/settings/supervised_user_settings_app_interface.mm b/ios/chrome/browser/ui/settings/supervised_user_settings_app_interface.mm
index a51c01e..7757a94 100644
--- a/ios/chrome/browser/ui/settings/supervised_user_settings_app_interface.mm
+++ b/ios/chrome/browser/ui/settings/supervised_user_settings_app_interface.mm
@@ -30,7 +30,7 @@
#import "ios/components/security_interstitials/ios_blocking_page_tab_helper.h"
#import "ios/components/security_interstitials/ios_security_interstitial_page.h"
#import "ios/web/public/web_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
#import "services/network/test/test_url_loader_factory.h"
diff --git a/ios/chrome/browser/ui/sharing/activity_services/activity_service_coordinator.mm b/ios/chrome/browser/ui/sharing/activity_services/activity_service_coordinator.mm
index 1124996..173c8f4a 100644
--- a/ios/chrome/browser/ui/sharing/activity_services/activity_service_coordinator.mm
+++ b/ios/chrome/browser/ui/sharing/activity_services/activity_service_coordinator.mm
@@ -32,7 +32,7 @@
#import "ios/chrome/browser/ui/sharing/sharing_positioner.h"
#import "ios/chrome/browser/web/model/web_navigation_browser_agent.h"
#import "ios/web/public/web_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "url/gurl.h"
#import <LinkPresentation/LinkPresentation.h>
diff --git a/ios/chrome/browser/ui/sharing/activity_services/data/share_to_data.mm b/ios/chrome/browser/ui/sharing/activity_services/data/share_to_data.mm
index 8312fa0..727bc76 100644
--- a/ios/chrome/browser/ui/sharing/activity_services/data/share_to_data.mm
+++ b/ios/chrome/browser/ui/sharing/activity_services/data/share_to_data.mm
@@ -6,7 +6,7 @@
#import "base/check.h"
#import "base/strings/sys_string_conversions.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
@interface ShareToData () {
// URL to be shared with share extensions.
diff --git a/ios/chrome/browser/ui/sharing/qr_generator/qr_generator_coordinator.mm b/ios/chrome/browser/ui/sharing/qr_generator/qr_generator_coordinator.mm
index acec8bc5..1ae19cf34 100644
--- a/ios/chrome/browser/ui/sharing/qr_generator/qr_generator_coordinator.mm
+++ b/ios/chrome/browser/ui/sharing/qr_generator/qr_generator_coordinator.mm
@@ -17,7 +17,7 @@
#import "ios/chrome/common/ui/confirmation_alert/confirmation_alert_action_handler.h"
#import "ios/chrome/common/ui/elements/popover_label_view_controller.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util_mac.h"
@interface QRGeneratorCoordinator () <ConfirmationAlertActionHandler> {
diff --git a/ios/chrome/browser/ui/sharing/qr_generator/qr_generator_coordinator_unittest.mm b/ios/chrome/browser/ui/sharing/qr_generator/qr_generator_coordinator_unittest.mm
index 08484ac..ea883a67 100644
--- a/ios/chrome/browser/ui/sharing/qr_generator/qr_generator_coordinator_unittest.mm
+++ b/ios/chrome/browser/ui/sharing/qr_generator/qr_generator_coordinator_unittest.mm
@@ -15,7 +15,7 @@
#import "ios/chrome/common/ui/confirmation_alert/confirmation_alert_action_handler.h"
#import "ios/chrome/common/ui/elements/popover_label_view_controller.h"
#import "ios/chrome/test/scoped_key_window.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "testing/platform_test.h"
#import "third_party/ocmock/OCMock/OCMock.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/base_grid_mediator.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/base_grid_mediator.mm
index 7b14c02..d36b5142 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/base_grid_mediator.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/base_grid_mediator.mm
@@ -67,7 +67,7 @@
#import "ios/web/public/navigation/navigation_manager.h"
#import "ios/web/public/web_state.h"
#import "ios/web/public/web_state_observer_bridge.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/gfx/image/image.h"
using PinnedState = WebStateSearchCriteria::PinnedState;
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/disabled_grid_view_controller.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/disabled_grid_view_controller.mm
index d31c81cf..170ad22 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/disabled_grid_view_controller.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/disabled_grid_view_controller.mm
@@ -15,7 +15,7 @@
#import "ios/chrome/common/ui/util/constraints_ui_util.h"
#import "ios/chrome/common/ui/util/text_view_util.h"
#import "ios/chrome/grit/ios_strings.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
#import "url/gurl.h"
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_tabs_mediator.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_tabs_mediator.mm
index 25264d4ca..ad2e03c 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_tabs_mediator.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_tabs_mediator.mm
@@ -29,7 +29,7 @@
#import "ios/web/public/navigation/navigation_manager.h"
#import "ios/web/public/web_state.h"
#import "ios/web/public/web_state_observer_bridge.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
using PinnedState = WebStateSearchCriteria::PinnedState;
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_egtest.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_egtest.mm
index 4951e751..eb73cea9 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_egtest.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_egtest.mm
@@ -47,7 +47,7 @@
#import "ios/web/public/test/http_server/data_response_provider.h"
#import "ios/web/public/test/http_server/http_server.h"
#import "ios/web/public/test/http_server/http_server_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/device_form_factor.h"
#import "ui/base/l10n/l10n_util.h"
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_strip/coordinator/tab_strip_mediator.mm b/ios/chrome/browser/ui/tab_switcher/tab_strip/coordinator/tab_strip_mediator.mm
index fe4bc11..029d20c 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_strip/coordinator/tab_strip_mediator.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_strip/coordinator/tab_strip_mediator.mm
@@ -29,7 +29,7 @@
#import "ios/web/public/navigation/navigation_manager.h"
#import "ios/web/public/web_state.h"
#import "ios/web/public/web_state_observer_bridge.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/gfx/image/image.h"
namespace {
diff --git a/ios/chrome/browser/upgrade/model/upgrade_center.mm b/ios/chrome/browser/upgrade/model/upgrade_center.mm
index 891d23c6..94cb81c5 100644
--- a/ios/chrome/browser/upgrade/model/upgrade_center.mm
+++ b/ios/chrome/browser/upgrade/model/upgrade_center.mm
@@ -28,7 +28,7 @@
#import "ios/chrome/grit/ios_branded_strings.h"
#import "ios/chrome/grit/ios_strings.h"
#import "ios/web/common/url_scheme_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
#import "ui/base/models/image_model.h"
#import "ui/gfx/image/image.h"
diff --git a/ios/chrome/browser/web/model/blocked_popup_tab_helper.mm b/ios/chrome/browser/web/model/blocked_popup_tab_helper.mm
index 7e8910c..76614809 100644
--- a/ios/chrome/browser/web/model/blocked_popup_tab_helper.mm
+++ b/ios/chrome/browser/web/model/blocked_popup_tab_helper.mm
@@ -24,7 +24,7 @@
#import "ios/chrome/browser/shared/model/browser_state/chrome_browser_state.h"
#import "ios/chrome/grit/ios_strings.h"
#import "ios/web/public/navigation/referrer.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/l10n/l10n_util.h"
#import "ui/base/models/image_model.h"
#import "ui/gfx/image/image.h"
diff --git a/ios/chrome/browser/web/model/invalid_url_tab_helper.mm b/ios/chrome/browser/web/model/invalid_url_tab_helper.mm
index 8d43309..b45b0d7 100644
--- a/ios/chrome/browser/web/model/invalid_url_tab_helper.mm
+++ b/ios/chrome/browser/web/model/invalid_url_tab_helper.mm
@@ -6,8 +6,8 @@
#import "base/strings/sys_string_conversions.h"
#import "ios/net/protocol_handler_util.h"
+#import "net/base/apple/url_conversions.h"
#import "net/base/data_url.h"
-#import "net/base/mac/url_conversions.h"
#import "net/base/net_errors.h"
#import "net/http/http_response_headers.h"
#import "ui/base/page_transition_types.h"
diff --git a/ios/chrome/browser/web/model/lookalike_url_app_interface.mm b/ios/chrome/browser/web/model/lookalike_url_app_interface.mm
index dcd77db9..2edc111e 100644
--- a/ios/chrome/browser/web/model/lookalike_url_app_interface.mm
+++ b/ios/chrome/browser/web/model/lookalike_url_app_interface.mm
@@ -13,7 +13,7 @@
#import "ios/components/security_interstitials/lookalikes/lookalike_url_tab_allow_list.h"
#import "ios/web/public/navigation/web_state_policy_decider.h"
#import "ios/web/public/web_state_user_data.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
namespace {
diff --git a/ios/chrome/browser/window_activities/model/window_activity_helpers.mm b/ios/chrome/browser/window_activities/model/window_activity_helpers.mm
index 35657772..1b207bd 100644
--- a/ios/chrome/browser/window_activities/model/window_activity_helpers.mm
+++ b/ios/chrome/browser/window_activities/model/window_activity_helpers.mm
@@ -11,7 +11,7 @@
#import "ios/chrome/browser/window_activities/model/move_tab_activity_type_buildflags.h"
#import "ios/web/public/navigation/navigation_manager.h"
#import "ios/web/public/web_state_id.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
// Activity types.
NSString* const kLoadURLActivityType = @"org.chromium.load.url";
diff --git a/ios/chrome/test/app/chrome_test_util.mm b/ios/chrome/test/app/chrome_test_util.mm
index 9e85fa76..53aed44f 100644
--- a/ios/chrome/test/app/chrome_test_util.mm
+++ b/ios/chrome/test/app/chrome_test_util.mm
@@ -40,7 +40,7 @@
#import "ios/web/public/navigation/navigation_context.h"
#import "ios/web/public/navigation/navigation_manager.h"
#import "ios/web/public/test/fakes/fake_web_state_observer.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
// A subclass to pass instances of UIOpenURLContext to scene delegate during
// testing. UIOpenURLContext has no init available, so this can only be
diff --git a/ios/chrome/test/earl_grey/chrome_earl_grey.mm b/ios/chrome/test/earl_grey/chrome_earl_grey.mm
index f6c3536..a761a6f2 100644
--- a/ios/chrome/test/earl_grey/chrome_earl_grey.mm
+++ b/ios/chrome/test/earl_grey/chrome_earl_grey.mm
@@ -24,7 +24,7 @@
#import "ios/testing/earl_grey/system_alert_handler.h"
#import "ios/testing/nserror_util.h"
#import "ios/web/public/test/element_selector.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
using base::test::ios::kWaitForActionTimeout;
using base::test::ios::kWaitForJSCompletionTimeout;
diff --git a/ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm b/ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm
index 112118a8..47a7d58 100644
--- a/ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm
+++ b/ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm
@@ -89,7 +89,7 @@
#import "ios/web/public/ui/crw_web_view_scroll_view_proxy.h"
#import "ios/web/public/web_client.h"
#import "ios/web/public/web_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "services/metrics/public/cpp/ukm_recorder.h"
#import "ui/base/device_form_factor.h"
