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

net/base/mock_host_resolver.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_BASE_MOCK_HOST_RESOLVER_H_
 #define NET_BASE_MOCK_HOST_RESOLVER_H_
 
 #include <list>
 
 #include "base/waitable_event.h"
@@ skipping 110 matching lines @@
   // Make sure that |host| will not be re-mapped or even processed by underlying
   // host resolver procedures. It can also be a pattern.
   void AllowDirectLookup(const std::string& host);
 
   // Simulate a lookup failure for |host| (it also can be a pattern).
   void AddSimulatedFailure(const std::string& host);
 
   // HostResolverProc methods:
   virtual int Resolve(const std::string& host,
                       AddressFamily address_family,
-                      HostResolverFlags host_resolver_flags,
                       AddressList* addrlist);
 
  private:
   ~RuleBasedHostResolverProc();
 
   struct Rule;
   typedef std::list<Rule> RuleList;
 
   RuleList rules_;
 };
 
 // Using WaitingHostResolverProc you can simulate very long lookups.
 class WaitingHostResolverProc : public HostResolverProc {
  public:
   explicit WaitingHostResolverProc(HostResolverProc* previous)
       : HostResolverProc(previous), event_(false, false) {}
 
   void Signal() {
     event_.Signal();
   }
 
   // HostResolverProc methods:
   virtual int Resolve(const std::string& host,
                       AddressFamily address_family,
-                      HostResolverFlags host_resolver_flags,
                       AddressList* addrlist) {
     event_.Wait();
-    return ResolveUsingPrevious(host, address_family, host_resolver_flags,
-                                addrlist);
+    return ResolveUsingPrevious(host, address_family, addrlist);
   }
 
  private:
   ~WaitingHostResolverProc() {}
 
   base::WaitableEvent event_;
 };
 
 // This class sets the default HostResolverProc for a particular scope.  The
 // chain of resolver procs starting at |proc| is placed in front of any existing
@@ skipping 14 matching lines @@
   void Init(HostResolverProc* proc);
 
  private:
   scoped_refptr<HostResolverProc> current_proc_;
   scoped_refptr<HostResolverProc> previous_proc_;
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_MOCK_HOST_RESOLVER_H_