Revert 43826 - HostResolver now adds AI_CANONNAME to the hint flags if a requ...

net/base/host_resolver_proc.cc

Index: net/base/host_resolver_proc.cc
===================================================================
--- net/base/host_resolver_proc.cc	(revision 43832)
+++ net/base/host_resolver_proc.cc	(working copy)
@@ -67,18 +67,14 @@
   return default_proc_;
 }
 
-int HostResolverProc::ResolveUsingPrevious(
-    const std::string& host,
-    AddressFamily address_family,
-    HostResolverFlags host_resolver_flags,
-    AddressList* addrlist) {
+int HostResolverProc::ResolveUsingPrevious(const std::string& host,
+                                           AddressFamily address_family,
+                                           AddressList* addrlist) {
   if (previous_proc_)
-    return previous_proc_->Resolve(host, address_family,
-                                   host_resolver_flags, addrlist);
+    return previous_proc_->Resolve(host, address_family, addrlist);
 
   // Final fallback is the system resolver.
-  return SystemHostResolverProc(host, address_family,
-                                host_resolver_flags, addrlist);
+  return SystemHostResolverProc(host, address_family, addrlist);
 }
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
@@ -156,7 +152,6 @@
 
 int SystemHostResolverProc(const std::string& host,
                            AddressFamily address_family,
-                           HostResolverFlags host_resolver_flags,
                            AddressList* addrlist) {
   // The result of |getaddrinfo| for empty hosts is inconsistent across systems.
   // On Windows it gives the default interface's address, whereas on Linux it
@@ -210,9 +205,6 @@
   hints.ai_flags = AI_ADDRCONFIG;
 #endif
 
-  if (host_resolver_flags & HOST_RESOLVER_FLAGS_CANONNAME)
-    hints.ai_flags |= AI_CANONNAME;
-
   // Restrict result set to only this socket type to avoid duplicates.
   hints.ai_socktype = SOCK_STREAM;