Create new //net/dns/public directory/target

This will hold all the simple host resolution code intended long-term
(post-servicification) for direct non-test access outside the network
stack and service.  For now, moving over dns_protocol.h and
dns_util::IsValidDoHTemplate(), two items currently used externally
that do not make sense to servicify. Will likely move over more in
subsequent CLs.

Similar to when //net/dns targets were split off from //net, no attempt
was made to detangle circular dependencies with //net.

Bug: 846454
Change-Id: I7cc209240f1c6f5ae2789c56faefb20662366230
Reviewed-on: https://chromium-review.googlesource.com/c/1320516
Reviewed-by: Bailey Berro <baileyberro@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Commit-Queue: Eric Orth <ericorth@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606155}

chrome/browser/chromeos/smb_client/discovery/mdns_host_locator.cc

@@ -8,8 +8,8 @@
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
-#include "net/dns/dns_protocol.h"
 #include "net/dns/mdns_client.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/dns/record_rdata.h"
 
 namespace chromeos {

chrome/browser/local_discovery/service_discovery_client_impl.cc

@@ -10,7 +10,7 @@
 #include "base/stl_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/local_discovery/service_discovery_client_impl.h"
-#include "net/dns/dns_protocol.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/dns/record_rdata.h"
 
 namespace local_discovery {

chrome/browser/local_discovery/service_discovery_client_unittest.cc

@@ -12,9 +12,9 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/local_discovery/service_discovery_client_impl.h"
 #include "net/base/net_errors.h"
-#include "net/dns/dns_protocol.h"
 #include "net/dns/mdns_client_impl.h"
 #include "net/dns/mock_mdns_socket_factory.h"
+#include "net/dns/public/dns_protocol.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/net/dns_probe_runner.cc

@@ -15,9 +15,9 @@
 #include "net/base/net_errors.h"
 #include "net/base/network_change_notifier.h"
 #include "net/dns/dns_client.h"
-#include "net/dns/dns_protocol.h"
 #include "net/dns/dns_response.h"
 #include "net/dns/dns_transaction.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/log/net_log_with_source.h"
 
 using base::TimeDelta;

chrome/browser/net/dns_probe_service.cc

@@ -15,7 +15,7 @@
 #include "net/base/ip_endpoint.h"
 #include "net/dns/dns_client.h"
 #include "net/dns/dns_config.h"
-#include "net/dns/dns_protocol.h"
+#include "net/dns/public/dns_protocol.h"
 
 using base::FieldTrialList;
 using base::StringToInt;

chrome/browser/net/dns_probe_test_util.cc

@@ -9,7 +9,7 @@
 #include "chrome/browser/net/dns_probe_runner.h"
 #include "net/base/ip_address.h"
 #include "net/dns/dns_config.h"
-#include "net/dns/dns_protocol.h"
+#include "net/dns/public/dns_protocol.h"
 
 using net::DnsClient;
 using net::DnsConfig;

chrome/browser/net/system_network_context_manager.cc

@@ -49,7 +49,7 @@
 #include "content/public/common/service_names.mojom.h"
 #include "content/public/common/user_agent.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr.h"
-#include "net/dns/dns_util.h"
+#include "net/dns/public/util.h"
 #include "net/net_buildflags.h"
 #include "net/third_party/uri_template/uri_template.h"
 #include "services/network/network_service.h"
@@ -117,8 +117,9 @@ void GetStubResolverConfig(
         continue;
       }
 
-      if (!net::IsValidDoHTemplate(doh_server_list[i].GetString(),
-                                   doh_server_method_list[i].GetString())) {
+      if (!net::dns_util::IsValidDoHTemplate(
+              doh_server_list[i].GetString(),
+              doh_server_method_list[i].GetString())) {
         continue;
       }
 

chrome/browser/printing/cloud_print/privet_traffic_detector.cc

@@ -19,8 +19,8 @@
 #include "net/base/address_family.h"
 #include "net/base/ip_address.h"
 #include "net/base/network_interfaces.h"
-#include "net/dns/dns_protocol.h"
 #include "net/dns/mdns_client.h"
+#include "net/dns/public/dns_protocol.h"
 #include "services/network/public/mojom/network_service.mojom.h"
 
 namespace {

components/certificate_transparency/log_dns_client.cc

@@ -24,9 +24,9 @@
 #include "net/cert/merkle_audit_proof.h"
 #include "net/dns/dns_client.h"
 #include "net/dns/dns_config.h"
-#include "net/dns/dns_protocol.h"
 #include "net/dns/dns_response.h"
 #include "net/dns/dns_transaction.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/dns/record_parsed.h"
 #include "net/dns/record_rdata.h"
 

components/certificate_transparency/log_dns_client_unittest.cc

@@ -24,7 +24,7 @@
 #include "net/cert/signed_certificate_timestamp.h"
 #include "net/dns/dns_client.h"
 #include "net/dns/dns_config.h"
-#include "net/dns/dns_protocol.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/log/net_log.h"
 #include "net/test/gtest_util.h"
 #include "testing/gmock/include/gmock/gmock.h"

components/certificate_transparency/mock_log_dns_traffic.cc

@@ -16,9 +16,9 @@
 #include "base/test/test_timeouts.h"
 #include "net/dns/dns_client.h"
 #include "net/dns/dns_config.h"
-#include "net/dns/dns_protocol.h"
 #include "net/dns/dns_query.h"
 #include "net/dns/dns_util.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/dns/record_rdata.h"
 #include "net/socket/socket_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"

net/BUILD.gn

@@ -391,6 +391,7 @@ component("net") {
     "//net/dns:host_resolver",
     "//net/dns:host_resolver_impl",
     "//net/dns:mdns_client",
+    "//net/dns/public",
   ]
 
   allow_circular_includes_from = [
@@ -399,6 +400,7 @@ component("net") {
     "//net/dns:host_resolver",
     "//net/dns:host_resolver_impl",
     "//net/dns:mdns_client",
+    "//net/dns/public",
   ]
 
   if (!is_nacl) {
@@ -2155,6 +2157,7 @@ source_set("net_deps") {
     "//net/dns:host_resolver",
     "//net/dns:host_resolver_impl",
     "//net/dns:mdns_client",
+    "//net/dns/public",
   ]
 
   public_deps = [
@@ -2222,6 +2225,7 @@ source_set("net_public_deps") {
     "//net/dns:host_resolver",
     "//net/dns:host_resolver_impl",
     "//net/dns:mdns_client",
+    "//net/dns/public",
   ]
 
   public_deps = [
@@ -5271,6 +5275,7 @@ test("net_unittests") {
     "//crypto:test_support",
     "//net/base/registry_controlled_domains",
     "//net/dns:tests",
+    "//net/dns/public:tests",
     "//net/http:transport_security_state_unittest_data",
     "//net/http:transport_security_state_unittest_data_default",
     "//net/interfaces:tests",

net/android/network_library.cc

@@ -10,7 +10,7 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/logging.h"
 #include "jni/AndroidNetworkLibrary_jni.h"
-#include "net/dns/dns_protocol.h"
+#include "net/dns/public/dns_protocol.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;

net/dns/BUILD.gn

@@ -290,7 +290,6 @@ source_set("dns_client") {
   if (!is_nacl) {
     sources += [
       "dns_client.h",
-      "dns_protocol.h",
       "dns_response.h",
       "dns_transaction.h",
       "record_parsed.h",
@@ -303,6 +302,7 @@ source_set("dns_client") {
   ]
   public_deps = [
     "//net:net_public_deps",
+    "//net/dns/public",
   ]
 }
 

net/dns/dns_config_service_posix.cc

@@ -24,8 +24,8 @@
 #include "net/base/ip_endpoint.h"
 #include "net/dns/dns_config.h"
 #include "net/dns/dns_hosts.h"
-#include "net/dns/dns_protocol.h"
 #include "net/dns/notify_watcher_mac.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/dns/serial_worker.h"
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)

net/dns/dns_config_service_posix_unittest.cc

@@ -16,7 +16,7 @@
 #include "net/base/ip_address.h"
 #include "net/dns/dns_config.h"
 #include "net/dns/dns_config_service_posix.h"
-#include "net/dns/dns_protocol.h"
+#include "net/dns/public/dns_protocol.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 

net/dns/dns_config_service_unittest.cc

@@ -14,7 +14,7 @@
 #include "base/strings/string_split.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "net/dns/dns_protocol.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/test/test_with_scoped_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

net/dns/dns_config_service_win.cc

@@ -33,7 +33,7 @@
 #include "net/base/ip_address.h"
 #include "net/base/network_change_notifier.h"
 #include "net/dns/dns_hosts.h"
-#include "net/dns/dns_protocol.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/dns/serial_worker.h"
 #include "url/url_canon.h"
 

net/dns/dns_config_service_win_unittest.cc

@@ -8,7 +8,7 @@
 #include "base/memory/free_deleter.h"
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
-#include "net/dns/dns_protocol.h"
+#include "net/dns/public/dns_protocol.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {

net/dns/dns_query.cc

@@ -10,8 +10,8 @@
 #include "base/numerics/safe_conversions.h"
 #include "base/sys_byteorder.h"
 #include "net/base/io_buffer.h"
-#include "net/dns/dns_protocol.h"
 #include "net/dns/dns_util.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/dns/record_rdata.h"
 
 namespace net {

net/dns/dns_query_unittest.cc

@@ -6,7 +6,7 @@
 
 #include "base/stl_util.h"
 #include "net/base/io_buffer.h"
-#include "net/dns/dns_protocol.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/dns/record_rdata.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

net/dns/dns_response.cc

@@ -18,9 +18,9 @@
 #include "net/base/io_buffer.h"
 #include "net/base/ip_address.h"
 #include "net/base/net_errors.h"
-#include "net/dns/dns_protocol.h"
 #include "net/dns/dns_query.h"
 #include "net/dns/dns_util.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/dns/record_rdata.h"
 
 namespace net {

net/dns/dns_response_fuzzer.cc

@@ -8,9 +8,9 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "net/base/io_buffer.h"
-#include "net/dns/dns_protocol.h"
 #include "net/dns/dns_query.h"
 #include "net/dns/dns_response.h"
+#include "net/dns/public/dns_protocol.h"
 
 // Entry point for LibFuzzer.
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {

net/dns/dns_response_unittest.cc

@@ -9,10 +9,10 @@
 #include "base/time/time.h"
 #include "net/base/address_list.h"
 #include "net/base/io_buffer.h"
-#include "net/dns/dns_protocol.h"
 #include "net/dns/dns_query.h"
 #include "net/dns/dns_test_util.h"
 #include "net/dns/dns_util.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/dns/record_rdata.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

net/dns/dns_session_unittest.cc

@@ -13,8 +13,8 @@
 #include "base/memory/ptr_util.h"
 #include "base/rand_util.h"
 #include "net/base/ip_address.h"
-#include "net/dns/dns_protocol.h"
 #include "net/dns/dns_socket_pool.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/log/net_log_source.h"
 #include "net/socket/socket_performance_watcher.h"
 #include "net/socket/socket_test_util.h"

net/dns/dns_test_util.h

@@ -14,7 +14,7 @@
 
 #include "net/dns/dns_client.h"
 #include "net/dns/dns_config.h"
-#include "net/dns/dns_protocol.h"
+#include "net/dns/public/dns_protocol.h"
 
 namespace net {
 

net/dns/dns_transaction.cc

@@ -41,11 +41,11 @@
 #include "net/base/net_errors.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/dns/dns_config.h"
-#include "net/dns/dns_protocol.h"
 #include "net/dns/dns_query.h"
 #include "net/dns/dns_response.h"
 #include "net/dns/dns_session.h"
 #include "net/dns/dns_util.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/log/net_log.h"
 #include "net/log/net_log_capture_mode.h"
 #include "net/log/net_log_event_type.h"

net/dns/dns_transaction_unittest.cc

@@ -28,12 +28,12 @@
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/base/url_util.h"
 #include "net/dns/dns_config.h"
-#include "net/dns/dns_protocol.h"
 #include "net/dns/dns_query.h"
 #include "net/dns/dns_response.h"
 #include "net/dns/dns_session.h"
 #include "net/dns/dns_test_util.h"
 #include "net/dns/dns_util.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/log/net_log.h"
 #include "net/log/net_log_capture_mode.h"
 #include "net/log/net_log_with_source.h"

net/dns/dns_util.cc

@@ -20,7 +20,7 @@
 #include "build/build_config.h"
 #include "net/base/address_list.h"
 #include "net/base/url_util.h"
-#include "net/dns/dns_protocol.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/third_party/uri_template/uri_template.h"
 #include "url/gurl.h"
 #include "url/url_canon.h"

net/dns/dns_util_unittest.cc

@@ -124,35 +124,4 @@ TEST_F(DNSUtilTest, GetURLFromTemplateWithoutParameters) {
                 "https://dnsserver.example.net/dns-query{?dns}"));
 }
 
-TEST_F(DNSUtilTest, IsValidDoHTemplate) {
-  EXPECT_TRUE(IsValidDoHTemplate(
-      "https://dnsserver.example.net/dns-query{?dns}", "GET"));
-  EXPECT_TRUE(IsValidDoHTemplate(
-      "https://dnsserver.example.net/dns-query{?dns,extra}", "GET"));
-  EXPECT_TRUE(IsValidDoHTemplate(
-      "https://dnsserver.example.net/dns-query{?dns}", "POST"));
-  EXPECT_TRUE(IsValidDoHTemplate(
-      "https://dnsserver.example.net/dns-query{?query}", "POST"));
-  EXPECT_TRUE(
-      IsValidDoHTemplate("https://dnsserver.example.net/dns-query", "POST"));
-  EXPECT_TRUE(
-      IsValidDoHTemplate("https://query:{dns}@dnsserver.example.net", "GET"));
-  EXPECT_TRUE(IsValidDoHTemplate("https://dnsserver.example.net{/dns}", "GET"));
-  // Invalid template format
-  EXPECT_FALSE(IsValidDoHTemplate(
-      "https://dnsserver.example.net/dns-query{{?dns}}", "GET"));
-  // Must be HTTPS
-  EXPECT_FALSE(
-      IsValidDoHTemplate("http://dnsserver.example.net/dns-query", "POST"));
-  EXPECT_FALSE(IsValidDoHTemplate(
-      "http://dnsserver.example.net/dns-query{?dns}", "GET"));
-  // GET requests require the template to have a dns variable
-  EXPECT_FALSE(IsValidDoHTemplate(
-      "https://dnsserver.example.net/dns-query{?query}", "GET"));
-  // Template must expand to a valid URL
-  EXPECT_FALSE(IsValidDoHTemplate("https://{?dns}", "GET"));
-  // The hostname must not contain the dns variable
-  EXPECT_FALSE(IsValidDoHTemplate("https://{dns}.dnsserver.net", "GET"));
-}
-
 }  // namespace net

net/dns/host_resolver_impl.cc

@@ -60,14 +60,14 @@
 #include "net/base/url_util.h"
 #include "net/dns/address_sorter.h"
 #include "net/dns/dns_client.h"
-#include "net/dns/dns_protocol.h"
 #include "net/dns/dns_reloader.h"
 #include "net/dns/dns_response.h"
 #include "net/dns/dns_transaction.h"
 #include "net/dns/dns_util.h"
 #include "net/dns/host_resolver_mdns_task.h"
 #include "net/dns/host_resolver_proc.h"
 #include "net/dns/mdns_client.h"
+#include "net/dns/public/dns_protocol.h"
 #include "net/log/net_log.h"
 #include "net/log/net_log_capture_mode.h"
 #include "net/log/net_log_event_type.h"