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

net/base/mock_host_resolver.cc

Index: net/base/mock_host_resolver.cc
===================================================================
--- net/base/mock_host_resolver.cc	(revision 43832)
+++ net/base/mock_host_resolver.cc	(working copy)
@@ -149,11 +149,8 @@
 
 void RuleBasedHostResolverProc::AddIPv6Rule(const std::string& host_pattern,
                                             const std::string& ipv6_literal) {
-  Rule rule(Rule::kResolverTypeIPV6Literal,
-            host_pattern,
-            ADDRESS_FAMILY_UNSPECIFIED,
-            ipv6_literal,
-            0);
+  Rule rule(Rule::kResolverTypeIPV6Literal, host_pattern,
+            ADDRESS_FAMILY_UNSPECIFIED, ipv6_literal, 0);
   rules_.push_back(rule);
 }
 
@@ -183,7 +180,6 @@
 
 int RuleBasedHostResolverProc::Resolve(const std::string& host,
                                        AddressFamily address_family,
-                                       HostResolverFlags host_resolver_flags,
                                        AddressList* addrlist) {
   RuleList::iterator r;
   for (r = rules_.begin(); r != rules_.end(); ++r) {
@@ -206,7 +202,6 @@
         case Rule::kResolverTypeSystem:
           return SystemHostResolverProc(effective_host,
                                         address_family,
-                                        host_resolver_flags,
                                         addrlist);
         case Rule::kResolverTypeIPV6Literal:
           return ResolveIPV6LiteralUsingGURL(effective_host, addrlist);
@@ -216,8 +211,7 @@
       }
     }
   }
-  return ResolveUsingPrevious(host, address_family,
-                              host_resolver_flags, addrlist);
+  return ResolveUsingPrevious(host, address_family, addrlist);
 }
 
 //-----------------------------------------------------------------------------