Rename //net/base/mac directory to //net/base/apple (5/5)
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.
3. Remove the temporary forwarding headers in net/base/mac, so that
we’re only left with net/base/apple. The changes here are performing
this step, which is the final of this series.
Bug: 1519486
Change-Id: Id26c756d621a5352baaa25cc4f0fe531adf9838e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5280346
Reviewed-by: Kenichi Ishibashi <bashi@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1258440}
diff --git a/ios/chrome/browser/ui/download/safari_download_coordinator_unittest.mm b/ios/chrome/browser/ui/download/safari_download_coordinator_unittest.mm
index 2bae61f..eae98d7 100644
--- a/ios/chrome/browser/ui/download/safari_download_coordinator_unittest.mm
+++ b/ios/chrome/browser/ui/download/safari_download_coordinator_unittest.mm
@@ -22,7 +22,7 @@
#import "ios/chrome/browser/shared/model/web_state_list/web_state_opener.h"
#import "ios/chrome/test/scoped_key_window.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 "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/net/BUILD.gn b/net/BUILD.gn
index 4a7973b..d20dfc5 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1204,7 +1204,6 @@
sources += [
"base/apple/url_conversions.h",
"base/apple/url_conversions.mm",
- "base/mac/url_conversions.h",
"base/network_change_notifier_apple.h",
"base/network_change_notifier_apple.mm",
"base/network_config_watcher_apple.cc",
diff --git a/net/base/mac/url_conversions.h b/net/base/mac/url_conversions.h
deleted file mode 100644
index 520fbc7..0000000
--- a/net/base/mac/url_conversions.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2012 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef NET_BASE_MAC_URL_CONVERSIONS_H_
-#define NET_BASE_MAC_URL_CONVERSIONS_H_
-
-// TODO(crbug.com/1519486): Get rid of this header inclusion (and this entire
-// file) as soon as we convert all of the usage from net/base/mac to
-// net/base/apple.
-#include "net/base/apple/url_conversions.h"
-
-#endif // NET_BASE_MAC_URL_CONVERSIONS_H_
