Move DnsConfigOverrides to /net/dns/public/

This struct is designed for use outside the network stack and is used as
part of the NetworkService mojo API.

Bug: 1129993
Change-Id: I6990e3f65a6a8a5a4d10d2f2f182288c4a0fc697
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427024
Commit-Queue: Eric Orth <ericorth@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Dan McArdle <dmcardle@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810785}

chrome/browser/net/dns_probe_service.h

@@ -11,7 +11,7 @@
 #include "base/callback.h"
 #include "components/error_page/common/net_error_info.h"
 #include "components/keyed_service/core/keyed_service.h"
-#include "net/dns/dns_config_overrides.h"
+#include "net/dns/public/dns_config_overrides.h"
 
 namespace chrome_browser_net {
 

chrome/browser/net/secure_dns_util.cc

@@ -15,7 +15,7 @@
 #include "components/embedder_support/pref_names.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
-#include "net/dns/dns_config_overrides.h"
+#include "net/dns/public/dns_config_overrides.h"
 #include "net/dns/public/doh_provider_entry.h"
 #include "net/dns/public/util.h"
 #include "net/third_party/uri_template/uri_template.h"

chrome/browser/net/secure_dns_util_unittest.cc

@@ -13,7 +13,7 @@
 #include "components/embedder_support/pref_names.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/testing_pref_service.h"
-#include "net/dns/dns_config_overrides.h"
+#include "net/dns/public/dns_config_overrides.h"
 #include "net/dns/public/doh_provider_entry.h"
 #include "testing/gmock/include/gmock/gmock-matchers.h"
 #include "testing/gtest/include/gtest/gtest.h"

net/dns/BUILD.gn

@@ -44,7 +44,6 @@ source_set("dns") {
       "context_host_resolver.cc",
       "context_host_resolver.h",
       "dns_config.cc",
-      "dns_config_overrides.cc",
       "dns_config_service.cc",
       "dns_config_service.h",
       "dns_hosts.cc",
@@ -219,7 +218,6 @@ source_set("host_resolver") {
   if (!is_nacl) {
     sources += [
       "dns_config.h",
-      "dns_config_overrides.h",
       "host_cache.h",
       "host_resolver.h",
       "host_resolver_source.h",
@@ -232,6 +230,8 @@ source_set("host_resolver") {
     "//net/dns/public",
   ]
   public_deps = [ "//net:net_public_deps" ]
+
+  allow_circular_includes_from = [ "//net/dns/public" ]
 }
 
 # Shared mostly-global handler of HostResolver requests.

net/dns/dns_client.h

@@ -12,8 +12,8 @@
 #include "net/base/net_export.h"
 #include "net/base/rand_callback.h"
 #include "net/dns/dns_config.h"
-#include "net/dns/dns_config_overrides.h"
 #include "net/dns/dns_hosts.h"
+#include "net/dns/public/dns_config_overrides.h"
 
 namespace net {
 

net/dns/host_resolver.h

@@ -19,9 +19,9 @@
 #include "net/base/completion_once_callback.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/request_priority.h"
-#include "net/dns/dns_config_overrides.h"
 #include "net/dns/host_cache.h"
 #include "net/dns/host_resolver_source.h"
+#include "net/dns/public/dns_config_overrides.h"
 #include "net/dns/public/dns_query_type.h"
 #include "net/dns/public/resolve_error_info.h"
 #include "net/dns/public/secure_dns_mode.h"

net/dns/host_resolver_manager.h

@@ -26,10 +26,10 @@
 #include "net/base/network_change_notifier.h"
 #include "net/base/prioritized_dispatcher.h"
 #include "net/dns/dns_config.h"
-#include "net/dns/dns_config_overrides.h"
 #include "net/dns/host_cache.h"
 #include "net/dns/host_resolver.h"
 #include "net/dns/host_resolver_proc.h"
+#include "net/dns/public/dns_config_overrides.h"
 #include "net/dns/public/dns_query_type.h"
 #include "net/dns/public/secure_dns_mode.h"
 #include "net/dns/resolve_context.h"

net/dns/public/BUILD.gn

@@ -18,6 +18,8 @@ source_set("public") {
   ]
 
   sources = [
+    "dns_config_overrides.cc",
+    "dns_config_overrides.h",
     "dns_over_https_server_config.cc",
     "dns_over_https_server_config.h",
     "dns_protocol.h",

net/dns/dns_config_overrides.cc → net/dns/public/dns_config_overrides.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/dns/dns_config_overrides.h"
+#include "net/dns/public/dns_config_overrides.h"
 
 #include "net/dns/dns_config.h"
 

net/dns/dns_config_overrides.h → net/dns/public/dns_config_overrides.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_DNS_DNS_CONFIG_OVERRIDES_H_
-#define NET_DNS_DNS_CONFIG_OVERRIDES_H_
+#ifndef NET_DNS_PUBLIC_DNS_CONFIG_OVERRIDES_H_
+#define NET_DNS_PUBLIC_DNS_CONFIG_OVERRIDES_H_
 
 #include <string>
 #include <vector>
@@ -70,4 +70,4 @@ struct NET_EXPORT DnsConfigOverrides {
 
 }  // namespace net
 
-#endif  // NET_DNS_DNS_CONFIG_OVERRIDES_H_
+#endif  // NET_DNS_PUBLIC_DNS_CONFIG_OVERRIDES_H_

services/network/network_context.h

@@ -31,8 +31,8 @@
 #include "mojo/public/cpp/bindings/unique_receiver_set.h"
 #include "net/cert/cert_verifier.h"
 #include "net/cert/cert_verify_result.h"
-#include "net/dns/dns_config_overrides.h"
 #include "net/dns/host_resolver.h"
+#include "net/dns/public/dns_config_overrides.h"
 #include "net/http/http_auth_preferences.h"
 #include "services/network/cors/preflight_controller.h"
 #include "services/network/http_cache_data_counter.h"

services/network/network_service.cc

@@ -35,9 +35,9 @@
 #include "net/cert/cert_database.h"
 #include "net/cert/ct_log_response_parser.h"
 #include "net/cert/signed_tree_head.h"
-#include "net/dns/dns_config_overrides.h"
 #include "net/dns/host_resolver.h"
 #include "net/dns/host_resolver_manager.h"
+#include "net/dns/public/dns_config_overrides.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/log/file_net_log_observer.h"
 #include "net/log/net_log.h"

services/network/public/cpp/host_resolver_mojom_traits.h

@@ -18,8 +18,8 @@
 #include "net/base/address_family.h"
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
-#include "net/dns/dns_config_overrides.h"
 #include "net/dns/host_resolver.h"
+#include "net/dns/public/dns_config_overrides.h"
 #include "net/dns/public/dns_query_type.h"
 #include "net/dns/public/secure_dns_mode.h"
 #include "services/network/public/mojom/host_resolver.mojom-forward.h"