Rename //net/base/mac directory to //net/base/apple (4/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 the remaining of the //ios directory, 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: Ifcf51d1ae3645001495bfec579d0f6be85966b55
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5217726
Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Commit-Queue: Tiago Vignatti <tvignatti@igalia.com>
Cr-Commit-Position: refs/heads/main@{#1252076}
diff --git a/ios/net/cookies/cookie_store_ios.mm b/ios/net/cookies/cookie_store_ios.mm
index 30b368e..1c16a0a 100644
--- a/ios/net/cookies/cookie_store_ios.mm
+++ b/ios/net/cookies/cookie_store_ios.mm
@@ -28,7 +28,7 @@
#import "ios/net/cookies/ns_http_system_cookie_store.h"
#import "ios/net/cookies/system_cookie_util.h"
#import "ios/net/ios_net_buildflags.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/cookies/cookie_constants.h"
#import "net/cookies/cookie_util.h"
#import "net/cookies/parsed_cookie.h"
diff --git a/ios/net/cookies/cookie_store_ios_unittest.mm b/ios/net/cookies/cookie_store_ios_unittest.mm
index 9167cf56..f8b4c39 100644
--- a/ios/net/cookies/cookie_store_ios_unittest.mm
+++ b/ios/net/cookies/cookie_store_ios_unittest.mm
@@ -19,7 +19,7 @@
#include "ios/net/cookies/cookie_store_ios_client.h"
#import "ios/net/cookies/cookie_store_ios_test_util.h"
#import "ios/net/cookies/ns_http_system_cookie_store.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "net/cookies/canonical_cookie.h"
#include "net/cookies/cookie_store_change_unittest.h"
#include "net/cookies/cookie_store_unittest.h"
diff --git a/ios/net/cookies/ns_http_system_cookie_store.mm b/ios/net/cookies/ns_http_system_cookie_store.mm
index 9ec3ad5..058ea0f 100644
--- a/ios/net/cookies/ns_http_system_cookie_store.mm
+++ b/ios/net/cookies/ns_http_system_cookie_store.mm
@@ -9,7 +9,7 @@
#import "ios/net/cookies/cookie_creation_time_manager.h"
#import "ios/net/cookies/cookie_store_ios_client.h"
#import "ios/net/cookies/system_cookie_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "url/gurl.h"
namespace net {
diff --git a/ios/net/cookies/system_cookie_store_unittest_template.h b/ios/net/cookies/system_cookie_store_unittest_template.h
index e03130ee..e70fb50 100644
--- a/ios/net/cookies/system_cookie_store_unittest_template.h
+++ b/ios/net/cookies/system_cookie_store_unittest_template.h
@@ -15,7 +15,7 @@
#include "base/run_loop.h"
#import "base/test/ios/wait_util.h"
#include "ios/net/cookies/cookie_store_ios_test_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
#include "url/gurl.h"
diff --git a/ios/net/crn_http_protocol_handler.mm b/ios/net/crn_http_protocol_handler.mm
index cb677d0..f274a78 100644
--- a/ios/net/crn_http_protocol_handler.mm
+++ b/ios/net/crn_http_protocol_handler.mm
@@ -28,11 +28,11 @@
#import "ios/net/http_protocol_logging.h"
#include "ios/net/nsurlrequest_util.h"
#import "ios/net/protocol_handler_util.h"
+#import "net/base/apple/url_conversions.h"
#include "net/base/auth.h"
#include "net/base/elements_upload_data_stream.h"
#include "net/base/io_buffer.h"
#include "net/base/load_flags.h"
-#import "net/base/mac/url_conversions.h"
#include "net/base/net_errors.h"
#include "net/base/upload_bytes_element_reader.h"
#include "net/http/http_request_headers.h"
diff --git a/ios/net/protocol_handler_util.mm b/ios/net/protocol_handler_util.mm
index 6f630f8..fe7b11bc 100644
--- a/ios/net/protocol_handler_util.mm
+++ b/ios/net/protocol_handler_util.mm
@@ -11,7 +11,7 @@
#include "base/strings/sys_string_conversions.h"
#include "base/time/time.h"
#include "ios/net/crn_http_url_response.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "net/base/net_errors.h"
#include "net/http/http_request_headers.h"
#include "net/http/http_response_headers.h"
diff --git a/ios/net/protocol_handler_util_unittest.mm b/ios/net/protocol_handler_util_unittest.mm
index e5b06e3..f61a6c7 100644
--- a/ios/net/protocol_handler_util_unittest.mm
+++ b/ios/net/protocol_handler_util_unittest.mm
@@ -11,8 +11,8 @@
#include "base/run_loop.h"
#include "base/strings/sys_string_conversions.h"
#include "base/test/task_environment.h"
+#import "net/base/apple/url_conversions.h"
#include "net/base/elements_upload_data_stream.h"
-#import "net/base/mac/url_conversions.h"
#include "net/base/upload_bytes_element_reader.h"
#include "net/http/http_request_headers.h"
#include "net/http/http_response_headers.h"
diff --git a/ios/web/browser_state_web_view_partition_inttest.mm b/ios/web/browser_state_web_view_partition_inttest.mm
index 3be7a651..7cfe31b 100644
--- a/ios/web/browser_state_web_view_partition_inttest.mm
+++ b/ios/web/browser_state_web_view_partition_inttest.mm
@@ -13,7 +13,7 @@
#import "ios/web/public/browser_state.h"
#import "ios/web/public/test/js_test_util.h"
#import "ios/web/test/web_int_test.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 "testing/gtest/include/gtest/gtest.h"
#import "testing/gtest_mac.h"
diff --git a/ios/web/crw_navigation_item_storage.mm b/ios/web/crw_navigation_item_storage.mm
index e6ad7931..736be29 100644
--- a/ios/web/crw_navigation_item_storage.mm
+++ b/ios/web/crw_navigation_item_storage.mm
@@ -12,7 +12,7 @@
#import "ios/web/public/session/proto/navigation.pb.h"
#import "ios/web/public/session/proto/proto_util.h"
#import "ios/web/public/web_client.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
namespace web {
diff --git a/ios/web/download/download_controller_impl.mm b/ios/web/download/download_controller_impl.mm
index 9f359e1..fdce56f1 100644
--- a/ios/web/download/download_controller_impl.mm
+++ b/ios/web/download/download_controller_impl.mm
@@ -17,7 +17,7 @@
#import "ios/web/public/browser_state.h"
#import "ios/web/public/download/download_controller_delegate.h"
#import "ios/web/public/web_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/http/http_request_headers.h"
namespace {
diff --git a/ios/web/download/download_session_cookie_storage.mm b/ios/web/download/download_session_cookie_storage.mm
index b2e78c6..911f5dee 100644
--- a/ios/web/download/download_session_cookie_storage.mm
+++ b/ios/web/download/download_session_cookie_storage.mm
@@ -6,7 +6,7 @@
#import "base/notreached.h"
#import "ios/net/cookies/system_cookie_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/cookies/canonical_cookie.h"
#import "net/cookies/cookie_constants.h"
diff --git a/ios/web/download/download_session_task_impl.mm b/ios/web/download/download_session_task_impl.mm
index 31775c1..6dd44f4 100644
--- a/ios/web/download/download_session_task_impl.mm
+++ b/ios/web/download/download_session_task_impl.mm
@@ -21,7 +21,7 @@
#import "ios/web/public/web_client.h"
#import "ios/web/public/web_state.h"
#import "ios/web/web_view/error_translation_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/cookies/cookie_store.h"
#import "net/url_request/url_request_context.h"
#import "net/url_request/url_request_context_getter.h"
diff --git a/ios/web/js_features/context_menu/context_menu_js_unittest.mm b/ios/web/js_features/context_menu/context_menu_js_unittest.mm
index 9b49994..acc8abe 100644
--- a/ios/web/js_features/context_menu/context_menu_js_unittest.mm
+++ b/ios/web/js_features/context_menu/context_menu_js_unittest.mm
@@ -19,7 +19,7 @@
#import "ios/web/public/test/javascript_test.h"
#import "ios/web/public/test/js_test_util.h"
#import "ios/web/test/fakes/crw_fake_script_message_handler.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 "url/gurl.h"
diff --git a/ios/web/js_features/context_menu/context_menu_params_utils_unittest.mm b/ios/web/js_features/context_menu/context_menu_params_utils_unittest.mm
index 5f4b8ea8..b9070c7 100644
--- a/ios/web/js_features/context_menu/context_menu_params_utils_unittest.mm
+++ b/ios/web/js_features/context_menu/context_menu_params_utils_unittest.mm
@@ -10,7 +10,7 @@
#import "ios/web/common/referrer_util.h"
#import "ios/web/js_features/context_menu/context_menu_constants.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/web/js_features/window_error/window_error_java_script_feature.mm b/ios/web/js_features/window_error/window_error_java_script_feature.mm
index afee1ba..b93a4462 100644
--- a/ios/web/js_features/window_error/window_error_java_script_feature.mm
+++ b/ios/web/js_features/window_error/window_error_java_script_feature.mm
@@ -7,7 +7,7 @@
#import "base/strings/sys_string_conversions.h"
#import "ios/web/public/js_messaging/java_script_feature_util.h"
#import "ios/web/public/js_messaging/script_message.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
namespace {
const char kScriptName[] = "error";
diff --git a/ios/web/js_messaging/java_script_content_world.mm b/ios/web/js_messaging/java_script_content_world.mm
index 4e14505..f4bf1e0 100644
--- a/ios/web/js_messaging/java_script_content_world.mm
+++ b/ios/web/js_messaging/java_script_content_world.mm
@@ -20,7 +20,7 @@
#import "ios/web/web_state/ui/crw_web_controller.h"
#import "ios/web/web_state/ui/wk_web_view_configuration_provider.h"
#import "ios/web/web_state/web_state_impl.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
namespace web {
diff --git a/ios/web/navigation/crw_error_page_helper_unittest.mm b/ios/web/navigation/crw_error_page_helper_unittest.mm
index 1635f04..b0ab238c3 100644
--- a/ios/web/navigation/crw_error_page_helper_unittest.mm
+++ b/ios/web/navigation/crw_error_page_helper_unittest.mm
@@ -6,7 +6,7 @@
#import "base/apple/bundle_locations.h"
#import "base/strings/sys_string_conversions.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/web/navigation/crw_js_navigation_handler.mm b/ios/web/navigation/crw_js_navigation_handler.mm
index c49c936..151780a 100644
--- a/ios/web/navigation/crw_js_navigation_handler.mm
+++ b/ios/web/navigation/crw_js_navigation_handler.mm
@@ -13,7 +13,7 @@
#import "ios/web/navigation/navigation_manager_impl.h"
#import "ios/web/web_state/user_interaction_state.h"
#import "ios/web/web_state/web_state_impl.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
namespace {
diff --git a/ios/web/navigation/crw_session_storage_unittest.mm b/ios/web/navigation/crw_session_storage_unittest.mm
index 119d9366..5763b44 100644
--- a/ios/web/navigation/crw_session_storage_unittest.mm
+++ b/ios/web/navigation/crw_session_storage_unittest.mm
@@ -20,7 +20,7 @@
#import "ios/web/public/session/proto/proto_util.h"
#import "ios/web/public/session/proto/storage.pb.h"
#import "ios/web/public/web_state_id.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/web/navigation/crw_web_view_navigation_observer.mm b/ios/web/navigation/crw_web_view_navigation_observer.mm
index d85f31a..f9005c40 100644
--- a/ios/web/navigation/crw_web_view_navigation_observer.mm
+++ b/ios/web/navigation/crw_web_view_navigation_observer.mm
@@ -21,7 +21,7 @@
#import "ios/web/public/web_client.h"
#import "ios/web/web_state/web_state_impl.h"
#import "ios/web/web_view/wk_web_view_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "url/gurl.h"
using web::NavigationManagerImpl;
diff --git a/ios/web/navigation/crw_wk_navigation_handler.mm b/ios/web/navigation/crw_wk_navigation_handler.mm
index c4cf6708..620b6ef 100644
--- a/ios/web/navigation/crw_wk_navigation_handler.mm
+++ b/ios/web/navigation/crw_wk_navigation_handler.mm
@@ -46,7 +46,7 @@
#import "ios/web/web_view/error_translation_util.h"
#import "ios/web/web_view/wk_security_origin_util.h"
#import "ios/web/web_view/wk_web_view_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/base/net_errors.h"
#import "net/cert/x509_util_apple.h"
#import "net/http/http_content_disposition.h"
diff --git a/ios/web/navigation/crw_wk_navigation_handler_inttest.mm b/ios/web/navigation/crw_wk_navigation_handler_inttest.mm
index 8aa184b..1c24589 100644
--- a/ios/web/navigation/crw_wk_navigation_handler_inttest.mm
+++ b/ios/web/navigation/crw_wk_navigation_handler_inttest.mm
@@ -17,7 +17,7 @@
#import "ios/web/security/wk_web_view_security_util.h"
#import "ios/web/test/web_int_test.h"
#import "ios/web/web_view/error_translation_util.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/embedded_test_server.h"
diff --git a/ios/web/navigation/navigation_manager_impl.mm b/ios/web/navigation/navigation_manager_impl.mm
index e5c7bea7..b68d8a9 100644
--- a/ios/web/navigation/navigation_manager_impl.mm
+++ b/ios/web/navigation/navigation_manager_impl.mm
@@ -33,7 +33,7 @@
#import "ios/web/public/web_client.h"
#import "ios/web/public/web_state.h"
#import "ios/web/web_state/ui/crw_web_view_navigation_proxy.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/web/navigation/navigation_manager_impl_unittest.mm b/ios/web/navigation/navigation_manager_impl_unittest.mm
index 92d3cf40..77b53fe5 100644
--- a/ios/web/navigation/navigation_manager_impl_unittest.mm
+++ b/ios/web/navigation/navigation_manager_impl_unittest.mm
@@ -35,7 +35,7 @@
#import "ios/web/test/test_url_constants.h"
#import "ios/web/web_state/ui/crw_web_view_navigation_proxy.h"
#import "ios/web/web_state/web_state_impl.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/web/navigation/wk_navigation_util_unittest.mm b/ios/web/navigation/wk_navigation_util_unittest.mm
index b74e8e8..0ba92e1 100644
--- a/ios/web/navigation/wk_navigation_util_unittest.mm
+++ b/ios/web/navigation/wk_navigation_util_unittest.mm
@@ -17,7 +17,7 @@
#import "ios/web/navigation/navigation_item_impl.h"
#import "ios/web/public/navigation/navigation_item.h"
#import "ios/web/test/test_url_constants.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 "url/scheme_host_port.h"
diff --git a/ios/web/net/cookies/wk_http_system_cookie_store.mm b/ios/web/net/cookies/wk_http_system_cookie_store.mm
index e26fd570..b72eefd 100644
--- a/ios/web/net/cookies/wk_http_system_cookie_store.mm
+++ b/ios/web/net/cookies/wk_http_system_cookie_store.mm
@@ -11,7 +11,7 @@
#import "ios/web/public/thread/web_task_traits.h"
#import "ios/web/public/thread/web_thread.h"
#import "ios/web/web_state/ui/wk_web_view_configuration_provider.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/cookies/canonical_cookie.h"
#import "net/cookies/cookie_constants.h"
#import "url/gurl.h"
diff --git a/ios/web/public/test/earl_grey/web_view_matchers.mm b/ios/web/public/test/earl_grey/web_view_matchers.mm
index 37cb7cb4..a21d2af 100644
--- a/ios/web/public/test/earl_grey/web_view_matchers.mm
+++ b/ios/web/public/test/earl_grey/web_view_matchers.mm
@@ -13,7 +13,7 @@
#import "ios/testing/earl_grey/earl_grey_app.h"
#import "ios/web/public/test/web_view_interaction_test_util.h"
#import "ios/web/public/web_state.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
// TODO(crbug.com/757982): Remove this class, after LoadImage() is removed.
// A helper delegate class that allows downloading responses with invalid
diff --git a/ios/web/public/test/http_server/http_server.mm b/ios/web/public/test/http_server/http_server.mm
index 9f4ed11..3ac070730d 100644
--- a/ios/web/public/test/http_server/http_server.mm
+++ b/ios/web/public/test/http_server/http_server.mm
@@ -14,7 +14,7 @@
#import "base/strings/string_number_conversions.h"
#import "base/strings/sys_string_conversions.h"
#import "ios/net/url_test_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 "net/test/embedded_test_server/http_request.h"
#import "net/test/embedded_test_server/http_response.h"
diff --git a/ios/web/public/test/http_server_inttest.mm b/ios/web/public/test/http_server_inttest.mm
index 36496d16..a69800e3 100644
--- a/ios/web/public/test/http_server_inttest.mm
+++ b/ios/web/public/test/http_server_inttest.mm
@@ -15,7 +15,7 @@
#import "ios/web/public/test/http_server/http_server.h"
#import "ios/web/public/test/http_server/string_response_provider.h"
#import "ios/web/test/web_int_test.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/http/http_response_headers.h"
#import "testing/gtest/include/gtest/gtest.h"
#import "testing/gtest_mac.h"
diff --git a/ios/web/public/test/web_view_content_test_util.mm b/ios/web/public/test/web_view_content_test_util.mm
index 53d8497..241a6823 100644
--- a/ios/web/public/test/web_view_content_test_util.mm
+++ b/ios/web/public/test/web_view_content_test_util.mm
@@ -17,7 +17,7 @@
#import "ios/web/public/js_messaging/web_frames_manager.h"
#import "ios/web/public/test/web_view_interaction_test_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::kWaitForDownloadTimeout;
diff --git a/ios/web/shell/view_controller.mm b/ios/web/shell/view_controller.mm
index 51aef54..b2be403 100644
--- a/ios/web/shell/view_controller.mm
+++ b/ios/web/shell/view_controller.mm
@@ -21,7 +21,7 @@
#import "ios/web/public/web_state_observer_bridge.h"
#import "ios/web/shell/shell_browser_state.h"
#import "ios/web/shell/shell_web_client.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "ui/base/page_transition_types.h"
NSString* const kWebShellBackButtonAccessibilityLabel = @"Back";
diff --git a/ios/web/web_state/error_page_inttest.mm b/ios/web/web_state/error_page_inttest.mm
index b34f6a7d..e244d15 100644
--- a/ios/web/web_state/error_page_inttest.mm
+++ b/ios/web/web_state/error_page_inttest.mm
@@ -29,7 +29,7 @@
#import "ios/web/public/web_client.h"
#import "ios/web/public/web_state.h"
#import "ios/web/test/test_url_constants.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/base/net_errors.h"
#import "net/test/embedded_test_server/default_handlers.h"
#import "net/test/embedded_test_server/request_handler_util.h"
diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm
index 7894811..282c491 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -62,7 +62,7 @@
#import "ios/web/web_state/web_view_internal_creation_util.h"
#import "ios/web/web_view/content_type_util.h"
#import "ios/web/web_view/wk_web_view_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "services/metrics/public/cpp/ukm_builders.h"
#import "url/gurl.h"
diff --git a/ios/web/web_state/ui/crw_web_controller_unittest.mm b/ios/web/web_state/ui/crw_web_controller_unittest.mm
index 978e6e2..09db6ce 100644
--- a/ios/web/web_state/ui/crw_web_controller_unittest.mm
+++ b/ios/web/web_state/ui/crw_web_controller_unittest.mm
@@ -51,7 +51,7 @@
#import "ios/web/web_state/ui/crw_web_controller.h"
#import "ios/web/web_state/ui/crw_web_controller_container_view.h"
#import "ios/web/web_state/web_state_impl.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/cert/x509_util_apple.h"
#import "net/ssl/ssl_info.h"
#import "net/test/cert_test_util.h"
diff --git a/ios/web/web_state/ui/crw_web_request_controller.mm b/ios/web/web_state/ui/crw_web_request_controller.mm
index f5e2c99..4d1811a 100644
--- a/ios/web/web_state/ui/crw_web_request_controller.mm
+++ b/ios/web/web_state/ui/crw_web_request_controller.mm
@@ -27,7 +27,7 @@
#import "ios/web/public/web_state.h"
#import "ios/web/web_state/user_interaction_state.h"
#import "ios/web/web_state/web_state_impl.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/base/url_util.h"
using web::wk_navigation_util::ExtractTargetURL;
diff --git a/ios/web/web_state/ui/crw_wk_ui_handler.mm b/ios/web/web_state/ui/crw_wk_ui_handler.mm
index 6c4b19c..70542f2 100644
--- a/ios/web/web_state/ui/crw_wk_ui_handler.mm
+++ b/ios/web/web_state/ui/crw_wk_ui_handler.mm
@@ -21,7 +21,7 @@
#import "ios/web/web_state/web_state_impl.h"
#import "ios/web/web_view/wk_security_origin_util.h"
#import "ios/web/webui/mojo_facade.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "url/gurl.h"
#import "url/origin.h"
diff --git a/ios/web/web_state/web_state_context_menu_bridge_unittest.mm b/ios/web/web_state/web_state_context_menu_bridge_unittest.mm
index 6b45c24..686b4d21 100644
--- a/ios/web/web_state/web_state_context_menu_bridge_unittest.mm
+++ b/ios/web/web_state/web_state_context_menu_bridge_unittest.mm
@@ -7,7 +7,7 @@
#import "ios/web/public/test/scoped_testing_web_client.h"
#import "ios/web/public/ui/context_menu_params.h"
#import "ios/web/test/web_test_with_web_controller.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/web/web_state/web_state_impl.mm b/ios/web/web_state/web_state_impl.mm
index a952d8a..291194c 100644
--- a/ios/web/web_state/web_state_impl.mm
+++ b/ios/web/web_state/web_state_impl.mm
@@ -25,7 +25,7 @@
#import "ios/web/web_state/ui/crw_web_controller.h"
#import "ios/web/web_state/web_state_impl_realized_web_state.h"
#import "ios/web/web_state/web_state_impl_serialized_data.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "url/gurl.h"
namespace web {
diff --git a/ios/web/web_state/web_state_observer_inttest.mm b/ios/web/web_state/web_state_observer_inttest.mm
index 5689bf4..dee4d4c 100644
--- a/ios/web/web_state/web_state_observer_inttest.mm
+++ b/ios/web/web_state/web_state_observer_inttest.mm
@@ -44,7 +44,7 @@
#import "ios/web/web_state/ui/crw_web_controller.h"
#import "ios/web/web_state/web_state_impl.h"
#import "ios/web/web_state/web_state_policy_decider_test_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/base/net_errors.h"
#import "net/http/http_response_headers.h"
#import "net/test/embedded_test_server/default_handlers.h"
diff --git a/ios/web/web_view/error_translation_util.mm b/ios/web/web_view/error_translation_util.mm
index 11a7d4a5..cf056b24 100644
--- a/ios/web/web_view/error_translation_util.mm
+++ b/ios/web/web_view/error_translation_util.mm
@@ -10,7 +10,7 @@
#import "base/ios/ns_error_util.h"
#import "ios/net/protocol_handler_util.h"
#import "ios/web/public/web_client.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/web/web_view/error_translation_util_unittest.mm b/ios/web/web_view/error_translation_util_unittest.mm
index bee1f08..703a2336 100644
--- a/ios/web/web_view/error_translation_util_unittest.mm
+++ b/ios/web/web_view/error_translation_util_unittest.mm
@@ -9,7 +9,7 @@
#import "base/apple/bridging.h"
#import "ios/net/protocol_handler_util.h"
#import "ios/web/test/test_url_constants.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/web/webui/crw_web_ui_scheme_handler.mm b/ios/web/webui/crw_web_ui_scheme_handler.mm
index 167eb96..7697ab82 100644
--- a/ios/web/webui/crw_web_ui_scheme_handler.mm
+++ b/ios/web/webui/crw_web_ui_scheme_handler.mm
@@ -10,7 +10,7 @@
#import "base/ranges/algorithm.h"
#import "ios/web/webui/url_fetcher_block_adapter.h"
#import "ios/web/webui/web_ui_ios_controller_factory_registry.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "url/gurl.h"
namespace {
diff --git a/ios/web/webui/crw_web_ui_scheme_handler_unittest.mm b/ios/web/webui/crw_web_ui_scheme_handler_unittest.mm
index da568c5..a67cf03 100644
--- a/ios/web/webui/crw_web_ui_scheme_handler_unittest.mm
+++ b/ios/web/webui/crw_web_ui_scheme_handler_unittest.mm
@@ -11,7 +11,7 @@
#import "ios/web/public/webui/web_ui_ios_controller.h"
#import "ios/web/public/webui/web_ui_ios_controller_factory.h"
#import "ios/web/test/test_url_constants.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"
#import "third_party/ocmock/OCMock/OCMock.h"
diff --git a/ios/web_view/internal/autofill/cwv_autofill_controller.mm b/ios/web_view/internal/autofill/cwv_autofill_controller.mm
index a7cb8be..a512704 100644
--- a/ios/web_view/internal/autofill/cwv_autofill_controller.mm
+++ b/ios/web_view/internal/autofill/cwv_autofill_controller.mm
@@ -49,7 +49,7 @@
#import "ios/web_view/internal/signin/web_view_identity_manager_factory.h"
#import "ios/web_view/internal/web_view_browser_state.h"
#import "ios/web_view/public/cwv_autofill_controller_delegate.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
using autofill::FieldRendererId;
using autofill::FormData;
diff --git a/ios/web_view/internal/autofill/cwv_autofill_controller_unittest.mm b/ios/web_view/internal/autofill/cwv_autofill_controller_unittest.mm
index 96a20e8..8f460f49 100644
--- a/ios/web_view/internal/autofill/cwv_autofill_controller_unittest.mm
+++ b/ios/web_view/internal/autofill/cwv_autofill_controller_unittest.mm
@@ -44,7 +44,7 @@
#import "ios/web_view/internal/passwords/web_view_password_manager_client.h"
#include "ios/web_view/internal/web_view_browser_state.h"
#import "ios/web_view/public/cwv_autofill_controller_delegate.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#import "testing/gtest_mac.h"
#import "third_party/ocmock/OCMock/OCMock.h"
diff --git a/ios/web_view/internal/autofill/cwv_credit_card_saver.mm b/ios/web_view/internal/autofill/cwv_credit_card_saver.mm
index f896092f..9d6b8e7 100644
--- a/ios/web_view/internal/autofill/cwv_credit_card_saver.mm
+++ b/ios/web_view/internal/autofill/cwv_credit_card_saver.mm
@@ -12,7 +12,7 @@
#include "ios/web/public/thread/web_task_traits.h"
#include "ios/web/public/thread/web_thread.h"
#import "ios/web_view/internal/autofill/cwv_credit_card_internal.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "ui/gfx/range/range.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/ios/web_view/internal/cwv_back_forward_list.mm b/ios/web_view/internal/cwv_back_forward_list.mm
index 2d14bc4f..d2da4b2 100644
--- a/ios/web_view/internal/cwv_back_forward_list.mm
+++ b/ios/web_view/internal/cwv_back_forward_list.mm
@@ -7,7 +7,7 @@
#import "base/strings/sys_string_conversions.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"
@implementation CWVBackForwardListItemArray {
BOOL _isBackList;
diff --git a/ios/web_view/internal/cwv_back_forward_list_item.mm b/ios/web_view/internal/cwv_back_forward_list_item.mm
index 9c65f8c..aaefc46 100644
--- a/ios/web_view/internal/cwv_back_forward_list_item.mm
+++ b/ios/web_view/internal/cwv_back_forward_list_item.mm
@@ -7,7 +7,7 @@
#import "base/apple/foundation_util.h"
#import "base/strings/sys_string_conversions.h"
#import "ios/web/public/navigation/navigation_item.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
@implementation CWVBackForwardListItem
diff --git a/ios/web_view/internal/cwv_download_task.mm b/ios/web_view/internal/cwv_download_task.mm
index fb69649e..a1c3105f 100644
--- a/ios/web_view/internal/cwv_download_task.mm
+++ b/ios/web_view/internal/cwv_download_task.mm
@@ -14,7 +14,7 @@
#include "ios/web/public/download/download_task_observer.h"
#import "ios/web/public/download/download_task_observer_bridge.h"
#include "ios/web_view/internal/cwv_web_view_internal.h"
-#include "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "net/base/net_errors.h"
int64_t const CWVDownloadSizeUnknown = -1;
diff --git a/ios/web_view/internal/cwv_favicon.mm b/ios/web_view/internal/cwv_favicon.mm
index 369d487..06dc384 100644
--- a/ios/web_view/internal/cwv_favicon.mm
+++ b/ios/web_view/internal/cwv_favicon.mm
@@ -6,7 +6,7 @@
#import <UIKit/UIKit.h>
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "ui/gfx/geometry/size.h"
#include "url/gurl.h"
diff --git a/ios/web_view/internal/cwv_favicon_unittest.mm b/ios/web_view/internal/cwv_favicon_unittest.mm
index 5af091d3..8b0264c 100644
--- a/ios/web_view/internal/cwv_favicon_unittest.mm
+++ b/ios/web_view/internal/cwv_favicon_unittest.mm
@@ -8,7 +8,7 @@
#include <vector>
#include "ios/web/public/favicon/favicon_url.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#import "testing/gtest_mac.h"
#include "testing/platform_test.h"
diff --git a/ios/web_view/internal/cwv_lookalike_url_handler.mm b/ios/web_view/internal/cwv_lookalike_url_handler.mm
index 9a92007..939de29 100644
--- a/ios/web_view/internal/cwv_lookalike_url_handler.mm
+++ b/ios/web_view/internal/cwv_lookalike_url_handler.mm
@@ -6,7 +6,7 @@
#include "ios/components/security_interstitials/lookalikes/lookalike_url_tab_allow_list.h"
#import "ios/web/public/navigation/navigation_manager.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
@implementation CWVLookalikeURLHandler {
web::WebState* _webState;
diff --git a/ios/web_view/internal/cwv_lookalike_url_handler_unittest.mm b/ios/web_view/internal/cwv_lookalike_url_handler_unittest.mm
index 9459095..3515557 100644
--- a/ios/web_view/internal/cwv_lookalike_url_handler_unittest.mm
+++ b/ios/web_view/internal/cwv_lookalike_url_handler_unittest.mm
@@ -12,7 +12,7 @@
#import "ios/components/security_interstitials/lookalikes/lookalike_url_tab_allow_list.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"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/gtest_mac.h"
#include "testing/platform_test.h"
diff --git a/ios/web_view/internal/cwv_web_view.mm b/ios/web_view/internal/cwv_web_view.mm
index 4deacf13..620194a 100644
--- a/ios/web_view/internal/cwv_web_view.mm
+++ b/ios/web_view/internal/cwv_web_view.mm
@@ -73,7 +73,7 @@
#import "ios/web_view/public/cwv_preview_element_info.h"
#import "ios/web_view/public/cwv_ui_delegate.h"
#import "ios/web_view/public/cwv_web_view_configuration.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "ui/base/page_transition_types.h"
#include "url/gurl.h"
diff --git a/ios/web_view/internal/safe_browsing/cwv_unsafe_url_handler.mm b/ios/web_view/internal/safe_browsing/cwv_unsafe_url_handler.mm
index d7ab0a7..8079b98 100644
--- a/ios/web_view/internal/safe_browsing/cwv_unsafe_url_handler.mm
+++ b/ios/web_view/internal/safe_browsing/cwv_unsafe_url_handler.mm
@@ -12,7 +12,7 @@
#import "ios/components/security_interstitials/safe_browsing/unsafe_resource_util.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"
CWVUnsafeURLThreatType CWVUnsafeURLThreatTypeFromSBThreatType(
safe_browsing::SBThreatType threatType) {
diff --git a/ios/web_view/internal/safe_browsing/cwv_unsafe_url_handler_unittest.mm b/ios/web_view/internal/safe_browsing/cwv_unsafe_url_handler_unittest.mm
index 35ca149..4efd308 100644
--- a/ios/web_view/internal/safe_browsing/cwv_unsafe_url_handler_unittest.mm
+++ b/ios/web_view/internal/safe_browsing/cwv_unsafe_url_handler_unittest.mm
@@ -11,7 +11,7 @@
#import "components/security_interstitials/core/unsafe_resource.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 "services/network/public/mojom/fetch_api.mojom.h"
#import "testing/gtest/include/gtest/gtest.h"
#import "testing/gtest_mac.h"
diff --git a/ios/web_view/internal/web_view_java_script_dialog_presenter.mm b/ios/web_view/internal/web_view_java_script_dialog_presenter.mm
index 3d42d5e..0b6960f 100644
--- a/ios/web_view/internal/web_view_java_script_dialog_presenter.mm
+++ b/ios/web_view/internal/web_view_java_script_dialog_presenter.mm
@@ -6,7 +6,7 @@
#import "base/functional/callback_helpers.h"
#import "ios/web_view/public/cwv_ui_delegate.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
namespace ios_web_view {
diff --git a/ios/web_view/internal/web_view_web_client.mm b/ios/web_view/internal/web_view_web_client.mm
index 136c3231..4b0d511 100644
--- a/ios/web_view/internal/web_view_web_client.mm
+++ b/ios/web_view/internal/web_view_web_client.mm
@@ -44,7 +44,7 @@
#import "ios/web_view/internal/web_view_web_main_parts.h"
#import "ios/web_view/public/cwv_navigation_delegate.h"
#import "ios/web_view/public/cwv_web_view.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#import "net/cert/cert_status_flags.h"
#import "ui/base/l10n/l10n_util.h"
#import "ui/base/resource/resource_bundle.h"
diff --git a/ios/web_view/test/navigation_delegate_inttest.mm b/ios/web_view/test/navigation_delegate_inttest.mm
index c0c2b51..cb4a369 100644
--- a/ios/web_view/test/navigation_delegate_inttest.mm
+++ b/ios/web_view/test/navigation_delegate_inttest.mm
@@ -7,7 +7,7 @@
#import "ios/web_view/test/web_view_inttest_base.h"
#import "ios/web_view/test/web_view_test_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "testing/gtest_mac.h"
#import "third_party/ocmock/OCMock/OCMock.h"
diff --git a/ios/web_view/test/ui_delegate_inttest.mm b/ios/web_view/test/ui_delegate_inttest.mm
index ac5b09a..4f3eff5 100644
--- a/ios/web_view/test/ui_delegate_inttest.mm
+++ b/ios/web_view/test/ui_delegate_inttest.mm
@@ -8,7 +8,7 @@
#import "base/test/ios/wait_util.h"
#import "ios/web_view/test/web_view_inttest_base.h"
#import "ios/web_view/test/web_view_test_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "testing/gtest_mac.h"
#import "third_party/ocmock/OCMock/OCMock.h"
diff --git a/ios/web_view/test/web_view_autofill_inttest.mm b/ios/web_view/test/web_view_autofill_inttest.mm
index 5638fde..60f729a7 100644
--- a/ios/web_view/test/web_view_autofill_inttest.mm
+++ b/ios/web_view/test/web_view_autofill_inttest.mm
@@ -11,7 +11,7 @@
#import "ios/web_view/public/cwv_navigation_delegate.h"
#import "ios/web_view/test/web_view_inttest_base.h"
#import "ios/web_view/test/web_view_test_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "testing/gtest_mac.h"
#import "third_party/ocmock/OCMock/OCMock.h"
diff --git a/ios/web_view/test/web_view_back_forward_list_inttest.mm b/ios/web_view/test/web_view_back_forward_list_inttest.mm
index fe163b2..1a7f9514e 100644
--- a/ios/web_view/test/web_view_back_forward_list_inttest.mm
+++ b/ios/web_view/test/web_view_back_forward_list_inttest.mm
@@ -9,7 +9,7 @@
#import "ios/web_view/test/observer.h"
#import "ios/web_view/test/web_view_inttest_base.h"
#import "ios/web_view/test/web_view_test_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "testing/gtest_mac.h"
#include "url/gurl.h"
diff --git a/ios/web_view/test/web_view_from_wk_web_view_configuration_inttest.mm b/ios/web_view/test/web_view_from_wk_web_view_configuration_inttest.mm
index 403941a..b0f2949 100644
--- a/ios/web_view/test/web_view_from_wk_web_view_configuration_inttest.mm
+++ b/ios/web_view/test/web_view_from_wk_web_view_configuration_inttest.mm
@@ -10,7 +10,7 @@
#import "ios/web_view/test/observer.h"
#import "ios/web_view/test/web_view_inttest_base.h"
#import "ios/web_view/test/web_view_test_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "testing/gtest_mac.h"
#include "url/gurl.h"
diff --git a/ios/web_view/test/web_view_inttest.mm b/ios/web_view/test/web_view_inttest.mm
index c1a1083..6d5d1b3 100644
--- a/ios/web_view/test/web_view_inttest.mm
+++ b/ios/web_view/test/web_view_inttest.mm
@@ -9,7 +9,7 @@
#import "base/test/ios/wait_util.h"
#import "ios/web_view/test/web_view_inttest_base.h"
#import "ios/web_view/test/web_view_test_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "net/test/embedded_test_server/http_request.h"
#include "net/test/embedded_test_server/http_response.h"
diff --git a/ios/web_view/test/web_view_kvo_inttest.mm b/ios/web_view/test/web_view_kvo_inttest.mm
index 285775ea..d89240b47 100644
--- a/ios/web_view/test/web_view_kvo_inttest.mm
+++ b/ios/web_view/test/web_view_kvo_inttest.mm
@@ -12,7 +12,7 @@
#import "ios/web_view/test/observer.h"
#import "ios/web_view/test/web_view_inttest_base.h"
#import "ios/web_view/test/web_view_test_util.h"
-#import "net/base/mac/url_conversions.h"
+#import "net/base/apple/url_conversions.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "testing/gtest_mac.h"
#include "url/gurl.h"
diff --git a/ios/web_view/test/web_view_script_message_handler_inttest.mm b/ios/web_view/test/web_view_script_message_handler_inttest.mm
index 50e1673..0a87611f5 100644
--- a/ios/web_view/test/web_view_script_message_handler_inttest.mm
+++ b/ios/web_view/test/web_view_script_message_handler_inttest.mm
@@ -7,7 +7,7 @@
#import "base/test/ios/wait_util.h"
#import "ios/web_view/test/web_view_inttest_base.h"
#import "ios/web_view/test/web_view_test_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 "testing/gtest_mac.h"
