base::Bind: Convert HostResolver::Resolve.

net/base/mapped_host_resolver.cc

 // 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.
 
 #include "net/base/mapped_host_resolver.h"
 
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 
 namespace net {
 
 MappedHostResolver::MappedHostResolver(HostResolver* impl)
     : impl_(impl) {
 }
 
 MappedHostResolver::~MappedHostResolver() {
 }
 
 int MappedHostResolver::Resolve(const RequestInfo& info,
                                 AddressList* addresses,
-                                OldCompletionCallback* callback,
+                                const CompletionCallback& callback,
                                 RequestHandle* out_req,
                                 const BoundNetLog& net_log) {
   DCHECK(addresses);
-  DCHECK(callback);
+  DCHECK_EQ(false, callback.is_null());

[willchan no longer on Chromium, 2011/11/14 16:45:12]

I'm going to stop nitting this pattern now. Just pointing out another instance
of DCHECK_EQ(false, ...).

   // Modify the request before forwarding it to |impl_|.
   RequestInfo modified_info = info;
   HostPortPair host_port(info.host_port_pair());
   if (rules_.RewriteHost(&host_port))
     modified_info.set_host_port_pair(host_port);
   return impl_->Resolve(modified_info, addresses, callback, out_req, net_log);
 }
 
 int MappedHostResolver::ResolveFromCache(const RequestInfo& info,
                                          AddressList* addresses,
@@ skipping 16 matching lines @@
 
 void MappedHostResolver::ProbeIPv6Support() {
   impl_->ProbeIPv6Support();
 }
 
 HostCache* MappedHostResolver::GetHostCache() {
   return impl_->GetHostCache();
 }
 
 }  // namespace net