Rename x509_util_ios_and_mac.h to x509_util_apple.h
Align with options like is_apple and BUILDFLAG(IS_APPLE). I'm told this
is the preferred name for shared macOS/iOS code these days, and this
file indeed wraps symbols common to all Apple platforms. (The history
here is that the macOS/iOS security APIs initially did not align, but
nowadays they match, if you avoid the deprecated macOS-only CSSM stuff,
and have a new enough macOS version.)
Change-Id: I983b325f310474031ec23f717a4207f286cb7e68
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3659374
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Matt Mueller <mattm@chromium.org>
Commit-Queue: David Benjamin <davidben@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1007631}
NOKEYCHECK=True
GitOrigin-RevId: 33a59b1c62b0e2b61be45fef4d707dedcb3c1e64
diff --git a/web/security/crw_cert_verification_controller_unittest.mm b/web/security/crw_cert_verification_controller_unittest.mm
index 4d8852c..a32a788 100644
--- a/web/security/crw_cert_verification_controller_unittest.mm
+++ b/web/security/crw_cert_verification_controller_unittest.mm
@@ -11,7 +11,7 @@
#import "ios/web/security/wk_web_view_security_util.h"
#include "net/cert/x509_certificate.h"
#include "net/cert/x509_util.h"
-#include "net/cert/x509_util_ios_and_mac.h"
+#include "net/cert/x509_util_apple.h"
#include "net/test/cert_test_util.h"
#include "net/test/test_data_directory.h"
diff --git a/web/security/crw_ssl_status_updater_unittest.mm b/web/security/crw_ssl_status_updater_unittest.mm
index 3f4bd66..6631ebd 100644
--- a/web/security/crw_ssl_status_updater_unittest.mm
+++ b/web/security/crw_ssl_status_updater_unittest.mm
@@ -15,7 +15,7 @@
#import "ios/web/security/wk_web_view_security_util.h"
#import "ios/web/test/fakes/crw_fake_back_forward_list.h"
#import "ios/web/test/fakes/fake_navigation_manager_delegate.h"
-#include "net/cert/x509_util_ios_and_mac.h"
+#include "net/cert/x509_util_apple.h"
#include "net/test/cert_test_util.h"
#include "net/test/test_data_directory.h"
#include "third_party/ocmock/OCMock/OCMock.h"
diff --git a/web/security/wk_web_view_security_util_unittest.mm b/web/security/wk_web_view_security_util_unittest.mm
index cbc018d..ef067ba 100644
--- a/web/security/wk_web_view_security_util_unittest.mm
+++ b/web/security/wk_web_view_security_util_unittest.mm
@@ -14,7 +14,7 @@
#include "crypto/rsa_private_key.h"
#include "net/cert/x509_certificate.h"
#include "net/cert/x509_util.h"
-#include "net/cert/x509_util_ios_and_mac.h"
+#include "net/cert/x509_util_apple.h"
#include "net/ssl/ssl_info.h"
#include "testing/gtest/include/gtest/gtest.h"
#import "testing/gtest_mac.h"
diff --git a/web/web_state/ui/crw_web_controller_unittest.mm b/web/web_state/ui/crw_web_controller_unittest.mm
index dce8f53..969873c 100644
--- a/web/web_state/ui/crw_web_controller_unittest.mm
+++ b/web/web_state/ui/crw_web_controller_unittest.mm
@@ -52,7 +52,7 @@
#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"
-#include "net/cert/x509_util_ios_and_mac.h"
+#include "net/cert/x509_util_apple.h"
#include "net/ssl/ssl_info.h"
#include "net/test/cert_test_util.h"
#include "net/test/test_data_directory.h"
