Rename HostResolverImpl -> HostResolverManager
Still filling the same role as before, implementing most of the logic
behind host resolution. But since it no longer directly implements the
HostResolver interface, its name was confusing.
Bug: 934402
Change-Id: I3e9ca0133d3b68bf230257a0208bdadb6d7a09cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1483691
Commit-Queue: Eric Orth <[email protected]>
Reviewed-by: Asanka Herath <[email protected]>
Cr-Commit-Position: refs/heads/master@{#639089}
diff --git a/net/dns/BUILD.gn b/net/dns/BUILD.gn
index 0e71ba1..ac1ff228 100644
--- a/net/dns/BUILD.gn
+++ b/net/dns/BUILD.gn
@@ -55,7 +55,8 @@
"dns_transaction.cc",
"host_cache.cc",
"host_resolver.cc",
- "host_resolver_impl.cc",
+ "host_resolver_manager.cc",
+ "host_resolver_manager.h",
"host_resolver_mdns_listener_impl.cc",
"host_resolver_mdns_listener_impl.h",
"host_resolver_mdns_task.cc",
@@ -105,7 +106,6 @@
public_deps = [
":dns_client",
":host_resolver",
- ":host_resolver_impl",
":mdns_client",
"//net:net_public_deps",
]
@@ -113,7 +113,6 @@
allow_circular_includes_from = [
":dns_client",
":host_resolver",
- ":host_resolver_impl",
":mdns_client",
]
}
@@ -131,7 +130,6 @@
# restriction.
visibility = [
":dns",
- ":host_resolver_impl",
":mdns_client",
"//net",
]
@@ -196,51 +194,6 @@
]
}
-# Overridable implementation details of HostResolver.
-source_set("host_resolver_impl") {
- # Due to circular dependencies, should only be depended on through //net.
- # Limit visibility to //net and other source_sets with the same access
- # restriction.
- visibility = [
- ":dns",
- "//net",
- ]
-
- # Whitelist-only access so we can keep track of all usage external to the
- # network stack.
- friend = [
- # chromeos/network/network_change_notifier_posix.cc
- # ChromeOS-specific change notifier with some overrides for DnsConfigService
- # TODO(crbug.com/882610): Remove/cleanup once we figure out servicification.
- "//chromeos/network",
-
- # Network stack/service
- "//components/cronet/*",
- "//net/*",
- "//services/network:tests",
- ]
-
- sources = []
- public = []
-
- if (!is_nacl) {
- sources += [ "host_resolver_impl.h" ]
-
- if (is_posix || is_fuchsia) {
- sources += [ "dns_config_service_posix.h" ]
- }
- }
-
- deps = [
- ":host_resolver",
- "//net:net_deps",
- "//net/dns/public",
- ]
- public_deps = [
- "//net:net_public_deps",
- ]
-}
-
# DnsClient interfaces. Primarily intended as part of the implementation of the
# standard HostResolver interface, but can be used as an alternative external
# interface for advanced usage.
@@ -368,7 +321,7 @@
"dns_transaction_unittest.cc",
"dns_util_unittest.cc",
"host_cache_unittest.cc",
- "host_resolver_impl_unittest.cc",
+ "host_resolver_manager_unittest.cc",
"mapped_host_resolver_unittest.cc",
"record_parsed_unittest.cc",
"record_rdata_unittest.cc",
@@ -493,9 +446,9 @@
dict = "//net/data/fuzzer_dictionaries/net_dns_record_fuzzer.dict"
}
-fuzzer_test("net_host_resolver_impl_fuzzer") {
+fuzzer_test("net_host_resolver_manager_fuzzer") {
sources = [
- "host_resolver_impl_fuzzer.cc",
+ "host_resolver_manager_fuzzer.cc",
]
deps = [
"//base",
@@ -503,7 +456,7 @@
"//net:net_fuzzer_test_support",
"//net:test_support",
]
- dict = "//net/data/fuzzer_dictionaries/net_host_resolver_impl_fuzzer.dict"
+ dict = "//net/data/fuzzer_dictionaries/net_host_resolver_manager_fuzzer.dict"
}
if (is_win) {