net: Move dns_util.* into dns directory.

It is DNS specific so it makes more sense to have it in net/dns rather
than in the generic net/base directory.

BUG=None
R=eroman@chromium.org,mmenke@chromium.org
TBR=gene@chromium.org,bauerb@chromium.org
NOPRESUBMIT=true

Review URL: https://codereview.chromium.org/1394233003

Cr-Commit-Position: refs/heads/master@{#353475}

22 files changed, 39 insertions, 40 deletions

diff --git a/chrome/browser/local_discovery/privet_traffic_detector.cc b/chrome/browser/local_discovery/privet_traffic_detector.cc
index a704ed4..e02f64c 100644
--- a/chrome/browser/local_discovery/privet_traffic_detector.cc
+++ b/chrome/browser/local_discovery/privet_traffic_detector.cc
@@ -8,7 +8,6 @@
 #include "base/metrics/histogram.h"
 #include "base/single_thread_task_runner.h"
 #include "base/sys_byteorder.h"
-#include "net/base/dns_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/network_interfaces.h"
 #include "net/dns/dns_protocol.h"
diff --git a/cloud_print/gcp20/prototype/dns_response_builder.cc b/cloud_print/gcp20/prototype/dns_response_builder.cc
index 07d07ea..c73689c 100644
--- a/cloud_print/gcp20/prototype/dns_response_builder.cc
+++ b/cloud_print/gcp20/prototype/dns_response_builder.cc
@@ -6,10 +6,10 @@
 
 #include "base/big_endian.h"
 #include "base/logging.h"
-#include "net/base/dns_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/dns/dns_response.h"
+#include "net/dns/dns_util.h"
 
 namespace {
 
diff --git a/cloud_print/gcp20/prototype/dns_sd_server.cc b/cloud_print/gcp20/prototype/dns_sd_server.cc
index 78d9812..a3ab0b7 100644
--- a/cloud_print/gcp20/prototype/dns_sd_server.cc
+++ b/cloud_print/gcp20/prototype/dns_sd_server.cc
@@ -14,7 +14,6 @@
 #include "cloud_print/gcp20/prototype/dns_packet_parser.h"
 #include "cloud_print/gcp20/prototype/dns_response_builder.h"
 #include "cloud_print/gcp20/prototype/gcp20_switches.h"
-#include "net/base/dns_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/dns/dns_protocol.h"
diff --git a/components/content_settings/core/common/content_settings_pattern.cc b/components/content_settings/core/common/content_settings_pattern.cc
index 1b49ba6..3065cb3 100644
--- a/components/content_settings/core/common/content_settings_pattern.cc
+++ b/components/content_settings/core/common/content_settings_pattern.cc
@@ -10,8 +10,8 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "components/content_settings/core/common/content_settings_pattern_parser.h"
-#include "net/base/dns_util.h"
 #include "net/base/net_util.h"
+#include "net/base/url_util.h"
 #include "url/gurl.h"
 
 namespace {
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index 9322114..a749683 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -42,10 +42,10 @@
 #include "base/sys_byteorder.h"
 #include "base/values.h"
 #include "net/base/address_list.h"
-#include "net/base/dns_util.h"
 #include "net/base/ip_address_number.h"
 #include "net/base/net_module.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+#include "net/base/url_util.h"
 #include "net/grit/net_resources.h"
 #include "net/http/http_content_disposition.h"
 #include "url/gurl.h"
diff --git a/net/base/url_util.cc b/net/base/url_util.cc
index 791f125..d2a86c5 100644
--- a/net/base/url_util.cc
+++ b/net/base/url_util.cc
@@ -132,4 +132,13 @@ bool GetValueForKeyInQuery(const GURL& url,
   return false;
 }
 
+std::string TrimEndingDot(const base::StringPiece& host) {
+  base::StringPiece host_trimmed = host;
+  size_t len = host_trimmed.length();
+  if (len > 1 && host_trimmed[len - 1] == '.') {
+    host_trimmed.remove_suffix(1);
+  }
+  return host_trimmed.as_string();
+}
+
 }  // namespace net
diff --git a/net/base/url_util.h b/net/base/url_util.h
index 533c908..15502e4 100644
--- a/net/base/url_util.h
+++ b/net/base/url_util.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/compiler_specific.h"
+#include "base/strings/string_piece.h"
 #include "net/base/net_export.h"
 #include "url/third_party/mozilla/url_parse.h"
 
@@ -77,6 +77,10 @@ NET_EXPORT bool GetValueForKeyInQuery(const GURL& url,
                                       const std::string& search_key,
                                       std::string* out_value);
 
+
+// Returns the hostname by trimming the ending dot, if one exists.
+NET_EXPORT std::string TrimEndingDot(const base::StringPiece& host);
+
 }  // namespace net
 
 #endif  // NET_BASE_URL_UTIL_H_
diff --git a/net/dns/dns_query.cc b/net/dns/dns_query.cc
index f418162..5154b54 100644
--- a/net/dns/dns_query.cc
+++ b/net/dns/dns_query.cc
@@ -8,9 +8,9 @@
 
 #include "base/big_endian.h"
 #include "base/sys_byteorder.h"
-#include "net/base/dns_util.h"
 #include "net/base/io_buffer.h"
 #include "net/dns/dns_protocol.h"
+#include "net/dns/dns_util.h"
 
 namespace net {
 
diff --git a/net/dns/dns_response.cc b/net/dns/dns_response.cc
index 730206c..663ae0e 100644
--- a/net/dns/dns_response.cc
+++ b/net/dns/dns_response.cc
@@ -8,11 +8,11 @@
 #include "base/strings/string_util.h"
 #include "base/sys_byteorder.h"
 #include "net/base/address_list.h"
-#include "net/base/dns_util.h"
 #include "net/base/io_buffer.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"
 
 namespace net {
 
diff --git a/net/dns/dns_test_util.cc b/net/dns/dns_test_util.cc
index 39857d7..08c1f92 100644
--- a/net/dns/dns_test_util.cc
+++ b/net/dns/dns_test_util.cc
@@ -13,13 +13,13 @@
 #include "base/single_thread_task_runner.h"
 #include "base/sys_byteorder.h"
 #include "base/thread_task_runner_handle.h"
-#include "net/base/dns_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/dns/address_sorter.h"
 #include "net/dns/dns_query.h"
 #include "net/dns/dns_response.h"
 #include "net/dns/dns_transaction.h"
+#include "net/dns/dns_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
index 020d5b4..66de33e 100644
--- a/net/dns/dns_transaction.cc
+++ b/net/dns/dns_transaction.cc
@@ -26,7 +26,6 @@
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "net/base/completion_callback.h"
-#include "net/base/dns_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
@@ -34,6 +33,7 @@
 #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/log/net_log.h"
 #include "net/socket/stream_socket.h"
 #include "net/udp/datagram_client_socket.h"
diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc
index dc0644a..3f79468 100644
--- a/net/dns/dns_transaction_unittest.cc
+++ b/net/dns/dns_transaction_unittest.cc
@@ -10,12 +10,12 @@
 #include "base/rand_util.h"
 #include "base/sys_byteorder.h"
 #include "base/test/test_timeouts.h"
-#include "net/base/dns_util.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/log/net_log.h"
 #include "net/socket/socket_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/base/dns_util.cc b/net/dns/dns_util.cc
index 9afaf4f..7ab60c6 100644
--- a/net/base/dns_util.cc
+++ b/net/dns/dns_util.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/base/dns_util.h"
+#include "net/dns/dns_util.h"
 
 #include <cstring>
 
@@ -82,13 +82,4 @@ std::string DNSDomainToString(const base::StringPiece& domain) {
   return ret;
 }
 
-std::string TrimEndingDot(const base::StringPiece& host) {
-  base::StringPiece host_trimmed = host;
-  size_t len = host_trimmed.length();
-  if (len > 1 && host_trimmed[len - 1] == '.') {
-    host_trimmed.remove_suffix(1);
-  }
-  return host_trimmed.as_string();
-}
-
 }  // namespace net
diff --git a/net/base/dns_util.h b/net/dns/dns_util.h
index 141f282..3332cb8 100644
--- a/net/base/dns_util.h
+++ b/net/dns/dns_util.h
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_BASE_DNS_UTIL_H_
-#define NET_BASE_DNS_UTIL_H_
+#ifndef NET_DNS_DNS_UTIL_H_
+#define NET_DNS_DNS_UTIL_H_
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/strings/string_piece.h"
 #include "net/base/net_export.h"
 
@@ -26,9 +25,6 @@ NET_EXPORT_PRIVATE bool DNSDomainFromDot(const base::StringPiece& dotted,
 NET_EXPORT_PRIVATE std::string DNSDomainToString(
     const base::StringPiece& domain);
 
-// Returns the hostname by trimming the ending dot, if one exists.
-NET_EXPORT std::string TrimEndingDot(const base::StringPiece& host);
-
 }  // namespace net
 
-#endif  // NET_BASE_DNS_UTIL_H_
+#endif  // NET_DNS_DNS_UTIL_H_
diff --git a/net/base/dns_util_unittest.cc b/net/dns/dns_util_unittest.cc
index 55e40c1..1d53471 100644
--- a/net/base/dns_util_unittest.cc
+++ b/net/dns/dns_util_unittest.cc
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/base/dns_util.h"
+#include "net/dns/dns_util.h"
+
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
index 417b3ae..8692fcd 100644
--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
@@ -35,7 +35,6 @@
 #include "base/values.h"
 #include "net/base/address_family.h"
 #include "net/base/address_list.h"
-#include "net/base/dns_util.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
@@ -47,6 +46,7 @@
 #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_proc.h"
 #include "net/log/net_log.h"
 #include "net/socket/client_socket_factory.h"
diff --git a/net/dns/host_resolver_proc.cc b/net/dns/host_resolver_proc.cc
index fbb40ca..4bed222 100644
--- a/net/dns/host_resolver_proc.cc
+++ b/net/dns/host_resolver_proc.cc
@@ -9,10 +9,10 @@
 #include "base/logging.h"
 #include "base/sys_byteorder.h"
 #include "net/base/address_list.h"
-#include "net/base/dns_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/sys_addrinfo.h"
 #include "net/dns/dns_reloader.h"
+#include "net/dns/dns_util.h"
 
 #if defined(OS_OPENBSD)
 #define AI_ADDRCONFIG 0
diff --git a/net/dns/mdns_client_impl.cc b/net/dns/mdns_client_impl.cc
index 053d4fe..2a6f6af 100644
--- a/net/dns/mdns_client_impl.cc
+++ b/net/dns/mdns_client_impl.cc
@@ -16,10 +16,10 @@
 #include "base/time/default_clock.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
-#include "net/base/dns_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/rand_callback.h"
 #include "net/dns/dns_protocol.h"
+#include "net/dns/dns_util.h"
 #include "net/dns/record_rdata.h"
 #include "net/log/net_log.h"
 #include "net/udp/datagram_socket.h"
diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc
index 89d4671..ddd5f8d 100644
--- a/net/http/transport_security_state.cc
+++ b/net/http/transport_security_state.cc
@@ -32,10 +32,10 @@
 #include "base/time/time.h"
 #include "base/values.h"
 #include "crypto/sha2.h"
-#include "net/base/dns_util.h"
 #include "net/base/host_port_pair.h"
 #include "net/cert/x509_cert_types.h"
 #include "net/cert/x509_certificate.h"
+#include "net/dns/dns_util.h"
 #include "net/http/http_security_headers.h"
 #include "net/ssl/ssl_info.h"
 #include "url/gurl.h"
diff --git a/net/net.gypi b/net/net.gypi
index 350be8a..b24915e 100644
--- a/net/net.gypi
+++ b/net/net.gypi
@@ -19,8 +19,6 @@
       'base/completion_callback.h',
       'base/connection_type_histograms.cc',
       'base/connection_type_histograms.h',
-      'base/dns_util.cc',
-      'base/dns_util.h',
       'base/escape.cc',
       'base/escape.h',
       'base/hash_value.cc',
@@ -57,6 +55,8 @@
       'base/registry_controlled_domains/registry_controlled_domain.cc',
       'base/registry_controlled_domains/registry_controlled_domain.h',
       'base/sys_addrinfo.h',
+      'base/url_util.cc',
+      'base/url_util.h',
       'base/zap.cc',
       'base/zap.h',
       'cert/asn1_util.cc',
@@ -118,6 +118,8 @@
       'der/parser.h',
       'der/tag.cc',
       'der/tag.h',
+      'dns/dns_util.cc',
+      'dns/dns_util.h',
       'http/http_auth_challenge_tokenizer.cc',
       'http/http_auth_challenge_tokenizer.h',
       'http/http_byte_range.cc',
@@ -513,8 +515,6 @@
       'base/upload_file_element_reader.cc',
       'base/upload_file_element_reader.h',
       'base/upload_progress.h',
-      'base/url_util.cc',
-      'base/url_util.h',
       'base/winsock_init.cc',
       'base/winsock_init.h',
       'base/winsock_util.cc',
@@ -1256,7 +1256,6 @@
       'base/chunked_upload_data_stream_unittest.cc',
       'base/data_url_unittest.cc',
       'base/directory_lister_unittest.cc',
-      'base/dns_util_unittest.cc',
       'base/elements_upload_data_stream_unittest.cc',
       'base/escape_unittest.cc',
       'base/expiring_cache_unittest.cc',
@@ -1358,6 +1357,7 @@
       'dns/dns_response_unittest.cc',
       'dns/dns_session_unittest.cc',
       'dns/dns_transaction_unittest.cc',
+      'dns/dns_util_unittest.cc',
       'dns/host_cache_unittest.cc',
       'dns/host_resolver_impl_unittest.cc',
       'dns/host_resolver_mojo_unittest.cc',
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index 08e0bfdf..6d9760f 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -85,7 +85,6 @@
 #include "crypto/rsa_private_key.h"
 #include "crypto/scoped_nss_types.h"
 #include "net/base/address_list.h"
-#include "net/base/dns_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
@@ -101,6 +100,7 @@
 #include "net/cert/x509_certificate_net_log_param.h"
 #include "net/cert/x509_util.h"
 #include "net/cert_net/nss_ocsp.h"
+#include "net/dns/dns_util.h"
 #include "net/http/transport_security_state.h"
 #include "net/log/net_log.h"
 #include "net/socket/client_socket_handle.h"
diff --git a/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc b/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc
index 549d11c..5bb6e11 100644
--- a/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc
+++ b/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc
@@ -15,12 +15,12 @@
 #include "base/time/time.h"
 #include "base/values.h"
 #include "net/base/address_list.h"
-#include "net/base/dns_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/dns/dns_protocol.h"
 #include "net/dns/dns_query.h"
 #include "net/dns/dns_response.h"
+#include "net/dns/dns_util.h"
 
 namespace {