Migrate net/socket/socket.h, net/socket/stream_socket.h to base::Bind().

net/dns/dns_transaction.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/dns/dns_transaction.h"
 
 #include "base/bind.h"
 #include "base/rand_util.h"
 #include "base/values.h"
 #include "net/base/dns_util.h"
@@ skipping 136 matching lines @@
                                const BoundNetLog& source_net_log,
                                NetLog* net_log)
     : dns_server_(dns_server),
       key_(dns_name, query_type),
       delegate_(NULL),
       query_(new DnsQuery(dns_name, query_type, rand_int)),
       attempts_(0),
       next_state_(STATE_NONE),
       socket_factory_(socket_factory ? socket_factory :
           ClientSocketFactory::GetDefaultFactory()),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          io_callback_(this, &DnsTransaction::OnIOComplete)),
       net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_DNS_TRANSACTION)) {
   DCHECK(!rand_int.is_null());
   for (size_t i = 0; i < arraysize(kTimeoutsMs); ++i)
     timeouts_ms_.push_back(base::TimeDelta::FromMilliseconds(kTimeoutsMs[i]));
   net_log_.BeginEvent(
       NetLog::TYPE_DNS_TRANSACTION,
       make_scoped_refptr(
           new DnsTransactionStartParameters(dns_server_, key_,
                                             source_net_log.source())));
 }
@@ skipping 96 matching lines @@
   if (rv < 0)
     return rv;
   next_state_ = STATE_SEND_QUERY;
   return OK;
 }
 
 int DnsTransaction::DoSendQuery() {
   next_state_ = STATE_SEND_QUERY_COMPLETE;
   return socket_->Write(query_->io_buffer(),
                         query_->io_buffer()->size(),
-                        &io_callback_);
+                        base::Bind(&DnsTransaction::OnIOComplete,
+                                   base::Unretained(this)));
 }
 
 int DnsTransaction::DoSendQueryComplete(int rv) {
   if (rv < 0)
     return rv;
 
   // Writing to UDP should not result in a partial datagram.
   if (rv != query_->io_buffer()->size())
     return ERR_NAME_NOT_RESOLVED;
 
   next_state_ = STATE_READ_RESPONSE;
   return OK;
 }
 
 int DnsTransaction::DoReadResponse() {
   next_state_ = STATE_READ_RESPONSE_COMPLETE;
   response_.reset(new DnsResponse(query_.get()));
   return socket_->Read(response_->io_buffer(),
                        response_->io_buffer()->size(),
-                       &io_callback_);
+                       base::Bind(&DnsTransaction::OnIOComplete,
+                                  base::Unretained(this)));
 }
 
 int DnsTransaction::DoReadResponseComplete(int rv) {
   DCHECK_NE(ERR_IO_PENDING, rv);
   RevokeTimer();
   if (rv < 0)
     return rv;
 
   DCHECK(rv);
   // TODO(agayev): when supporting EDNS0 we may need to do multiple reads
@@ skipping 23 matching lines @@
     DoCallback(rv);
 }
 
 void DnsTransaction::set_timeouts_ms(
     const std::vector<base::TimeDelta>& timeouts_ms) {
   DCHECK_EQ(0u, attempts_);
   timeouts_ms_ = timeouts_ms;
 }
 
 }  // namespace net