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/io_buffer.h"
@@ skipping 81 matching lines @@
                                const base::StringPiece& qname,
                                uint16 qtype,
                                const ResultCallback& callback,
                                const BoundNetLog& source_net_log)
     : session_(session),
       dns_server_(session->NextServer()),
       query_(new DnsQuery(session->NextId(), qname, qtype)),
       callback_(callback),
       attempts_(0),
       next_state_(STATE_NONE),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          io_callback_(this, &DnsTransaction::OnIOComplete)),
       net_log_(BoundNetLog::Make(session->net_log(),
           NetLog::SOURCE_DNS_TRANSACTION)) {
   net_log_.BeginEvent(
       NetLog::TYPE_DNS_TRANSACTION,
       make_scoped_refptr(
           new DnsTransactionStartParameters(dns_server_,
                                             qname,
                                             qtype,
                                             source_net_log.source())));
 }
@@ skipping 85 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_MSG_TOO_BIG;
 
   next_state_ = STATE_READ_RESPONSE;
   return OK;
 }
 
 int DnsTransaction::DoReadResponse() {
   next_state_ = STATE_READ_RESPONSE_COMPLETE;
   response_.reset(new DnsResponse());
   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);
   if (!response_->InitParse(rv, *query_))
@@ skipping 29 matching lines @@
     return;
   }
   next_state_ = STATE_CONNECT;
   query_.reset(query_->CloneWithNewId(session_->NextId()));
   int rv = DoLoop(OK);
   if (rv != ERR_IO_PENDING)
     DoCallback(rv);
 }
 
 }  // namespace net