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

content/browser/renderer_host/p2p/socket_host_udp.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 "content/browser/renderer_host/p2p/socket_host_udp.h"
 
+#include "base/bind.h"
 #include "content/common/p2p_messages.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 
 namespace {
 
 // UDP packets cannot be bigger than 64k.
 const int kReadBufferSize = 65536;
 
@@ skipping 10 matching lines @@
 }
 
 P2PSocketHostUdp::PendingPacket::~PendingPacket() {
 }
 
 P2PSocketHostUdp::P2PSocketHostUdp(IPC::Message::Sender* message_sender,
                                    int routing_id, int id)
     : P2PSocketHost(message_sender, routing_id, id),
       socket_(new net::UDPServerSocket(NULL, net::NetLog::Source())),
       send_queue_bytes_(0),
-      send_pending_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          recv_callback_(this, &P2PSocketHostUdp::OnRecv)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          send_callback_(this, &P2PSocketHostUdp::OnSend)) {
+      send_pending_(false) {
 }
 
 P2PSocketHostUdp::~P2PSocketHostUdp() {
   if (state_ == STATE_OPEN) {
     DCHECK(socket_.get());
     socket_.reset();
   }
 }
 
 bool P2PSocketHostUdp::Init(const net::IPEndPoint& local_address,
@@ skipping 34 matching lines @@
   if (state_ == STATE_UNINITIALIZED || state_ == STATE_OPEN)
     message_sender_->Send(new P2PMsg_OnError(routing_id_, id_));
 
   state_ = STATE_ERROR;
 }
 
 void P2PSocketHostUdp::DoRead() {
   int result;
   do {
     result = socket_->RecvFrom(recv_buffer_, kReadBufferSize, &recv_address_,
-                               &recv_callback_);
+                               base::Bind(&P2PSocketHostUdp::OnRecv,
+                                          base::Unretained(this)));
     DidCompleteRead(result);
   } while (result > 0);
 }
 
 void P2PSocketHostUdp::OnRecv(int result) {
   DidCompleteRead(result);
   if (state_ == STATE_OPEN) {
     DoRead();
   }
 }
@@ skipping 53 matching lines @@
     send_queue_.push_back(PendingPacket(to, data));
     send_queue_bytes_ += data.size();
   } else {
     PendingPacket packet(to, data);
     DoSend(packet);
   }
 }
 
 void P2PSocketHostUdp::DoSend(const PendingPacket& packet) {
   int result = socket_->SendTo(packet.data, packet.size, packet.to,
-                               &send_callback_);
+                               base::Bind(&P2PSocketHostUdp::OnSend,
+                                          base::Unretained(this)));
   if (result == net::ERR_IO_PENDING) {
     send_pending_ = true;
   } else if (result < 0) {
     LOG(ERROR) << "Error when sending data in UDP socket: " << result;
     OnError();
   }
 }
 
 void P2PSocketHostUdp::OnSend(int result) {
   DCHECK(send_pending_);
@@ skipping 13 matching lines @@
 }
 
 P2PSocketHost* P2PSocketHostUdp::AcceptIncomingTcpConnection(
     const net::IPEndPoint& remote_address, int id) {
   NOTREACHED();
   OnError();
   return NULL;
 }
 
 }  // namespace content