Change HostResolver::Resolve() to take an std::unique_ptr<Request>* rather than a RequestHandle*

net/dns/mock_host_resolver.h

 // Copyright (c) 2011 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_DNS_MOCK_HOST_RESOLVER_H_
 #define NET_DNS_MOCK_HOST_RESOLVER_H_
 
 #include <stddef.h>
 
 #include <list>
@@ skipping 40 matching lines @@
 // Replacement doesn't have to be string representing an IP address. It can
 // re-map one hostname to another as well.
 //
 // By default, MockHostResolvers include a single rule that maps all hosts to
 // 127.0.0.1.
 
 // Base class shared by MockHostResolver and MockCachingHostResolver.
 class MockHostResolverBase : public HostResolver,
                              public base::SupportsWeakPtr<MockHostResolverBase>,
                              public base::NonThreadSafe {
+ private:
+  class RequestImpl;
+
  public:
   ~MockHostResolverBase() override;
 
   RuleBasedHostResolverProc* rules() { return rules_.get(); }
   void set_rules(RuleBasedHostResolverProc* rules) { rules_ = rules; }
 
   // Controls whether resolutions complete synchronously or asynchronously.
   void set_synchronous_mode(bool is_synchronous) {
     synchronous_mode_ = is_synchronous;
   }
 
   // Asynchronous requests are automatically resolved by default.
   // If set_ondemand_mode() is set then Resolve() returns IO_PENDING and
   // ResolveAllPending() must be explicitly invoked to resolve all requests
   // that are pending.
   void set_ondemand_mode(bool is_ondemand) {
     ondemand_mode_ = is_ondemand;
   }
 
   // HostResolver methods:
   int Resolve(const RequestInfo& info,
               RequestPriority priority,
               AddressList* addresses,
               const CompletionCallback& callback,
-              RequestHandle* out_req,
+              std::unique_ptr<Request>* request,
               const BoundNetLog& net_log) override;
   int ResolveFromCache(const RequestInfo& info,
                        AddressList* addresses,
                        const BoundNetLog& net_log) override;
-  void CancelRequest(RequestHandle req) override;
   HostCache* GetHostCache() override;
 
+  // Detach cancelled request.
+  void DetachRequest(size_t id);
+
   // Resolves all pending requests. It is only valid to invoke this if
   // set_ondemand_mode was set before. The requests are resolved asynchronously,
   // after this call returns.
   void ResolveAllPending();
 
   // Returns true if there are pending requests that can be resolved by invoking
   // ResolveAllPending().
   bool has_pending_requests() const { return !requests_.empty(); }
 
   // The number of times that Resolve() has been called.
   size_t num_resolve() const {
     return num_resolve_;
   }
 
   // The number of times that ResolveFromCache() has been called.
   size_t num_resolve_from_cache() const {
     return num_resolve_from_cache_;
   }
 
   // Returns the RequestPriority of the last call to Resolve() (or
   // DEFAULT_PRIORITY if Resolve() hasn't been called yet).
   RequestPriority last_request_priority() const {
     return last_request_priority_;
   }
 
  protected:
   explicit MockHostResolverBase(bool use_caching);
 
  private:
-  struct Request;
-  typedef std::map<size_t, Request*> RequestMap;
+  typedef std::map<size_t, RequestImpl*> RequestMap;
 
   // Resolve as IP or from |cache_| return cached error or
   // DNS_CACHE_MISS if failed.
   int ResolveFromIPLiteralOrCache(const RequestInfo& info,
                                   AddressList* addresses);
   // Resolve via |proc_|.
-  int ResolveProc(size_t id, const RequestInfo& info, AddressList* addresses);
+  int ResolveProc(const RequestInfo& info, AddressList* addresses);
   // Resolve request stored in |requests_|. Pass rv to callback.
   void ResolveNow(size_t id);
 
   RequestPriority last_request_priority_;
   bool synchronous_mode_;
   bool ondemand_mode_;
   scoped_refptr<RuleBasedHostResolverProc> rules_;
   std::unique_ptr<HostCache> cache_;
   RequestMap requests_;
   size_t next_request_id_;
@@ skipping 91 matching lines @@
 // Create rules that map all requests to localhost.
 RuleBasedHostResolverProc* CreateCatchAllHostResolverProc();
 
 // HangingHostResolver never completes its |Resolve| request.
 class HangingHostResolver : public HostResolver {
  public:
   int Resolve(const RequestInfo& info,
               RequestPriority priority,
               AddressList* addresses,
               const CompletionCallback& callback,
-              RequestHandle* out_req,
+              std::unique_ptr<Request>* out_req,
               const BoundNetLog& net_log) override;
   int ResolveFromCache(const RequestInfo& info,
                        AddressList* addresses,
                        const BoundNetLog& net_log) override;
-  void CancelRequest(RequestHandle req) override {}
 };
 
 // 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
 // default resolver proc(s).  This means that if multiple
 // ScopedDefaultHostResolverProcs are declared, then resolving will start with
 // the procs given to the last-allocated one, then fall back to the procs given
 // to the previously-allocated one, and so forth.
 //
 // NOTE: Only use this as a catch-all safety net. Individual tests should use
 // MockHostResolver.
 class ScopedDefaultHostResolverProc {
  public:
   ScopedDefaultHostResolverProc();
   explicit ScopedDefaultHostResolverProc(HostResolverProc* proc);
 
   ~ScopedDefaultHostResolverProc();
 
   void Init(HostResolverProc* proc);
 
  private:
   scoped_refptr<HostResolverProc> current_proc_;
   scoped_refptr<HostResolverProc> previous_proc_;
 };
 
 }  // namespace net
 
 #endif  // NET_DNS_MOCK_HOST_RESOLVER_H_