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

content/browser/renderer_host/pepper_udp_socket.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/pepper_udp_socket.h"
 
 #include <string.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "content/browser/renderer_host/pepper_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/udp/udp_server_socket.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/private/net_address_private_impl.h"
 
 using content::BrowserThread;
 using ppapi::NetAddressPrivateImpl;
 
 PepperUDPSocket::PepperUDPSocket(
     PepperMessageFilter* manager,
     int32 routing_id,
     uint32 plugin_dispatcher_id,
     uint32 socket_id)
     : manager_(manager),
       routing_id_(routing_id),
       plugin_dispatcher_id_(plugin_dispatcher_id),
-      socket_id_(socket_id),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          recvfrom_callback_(this, &PepperUDPSocket::OnRecvFromCompleted)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          sendto_callback_(this, &PepperUDPSocket::OnSendToCompleted)) {
+      socket_id_(socket_id) {
   DCHECK(manager);
 }
 
 PepperUDPSocket::~PepperUDPSocket() {
   // Make sure there are no further callbacks from socket_.
   if (socket_.get())
     socket_->Close();
 }
 
 void PepperUDPSocket::Bind(const PP_NetAddress_Private& addr) {
@@ skipping 11 matching lines @@
   SendBindACK(result == net::OK);
 }
 
 void PepperUDPSocket::RecvFrom(int32_t num_bytes) {
   if (recvfrom_buffer_.get()) {
     SendRecvFromACKError();
     return;
   }
 
   recvfrom_buffer_ = new net::IOBuffer(num_bytes);
-  int result = socket_->RecvFrom(recvfrom_buffer_,
-                                 num_bytes,
-                                 &recvfrom_address_,
-                                 &recvfrom_callback_);
+  int result = socket_->RecvFrom(
+      recvfrom_buffer_, num_bytes, &recvfrom_address_,
+      base::Bind(&PepperUDPSocket::OnRecvFromCompleted,
+                 base::Unretained(this)));
 
   if (result != net::ERR_IO_PENDING)
     OnRecvFromCompleted(result);
 }
 
 void PepperUDPSocket::SendTo(const std::string& data,
                              const PP_NetAddress_Private& addr) {
   if (sendto_buffer_.get() || data.empty()) {
     SendSendToACKError();
     return;
   }
 
   net::IPEndPoint address;
   if (!NetAddressPrivateImpl::NetAddressToIPEndPoint(addr, &address)) {
     SendSendToACKError();
     return;
   }
 
   int data_size = data.size();
 
   sendto_buffer_ = new net::IOBuffer(data_size);
   memcpy(sendto_buffer_->data(), data.data(), data_size);
-  int result = socket_->SendTo(sendto_buffer_,
-                               data_size,
-                               address,
-                               &sendto_callback_);
+  int result = socket_->SendTo(
+      sendto_buffer_, data_size, address,
+      base::Bind(&PepperUDPSocket::OnSendToCompleted, base::Unretained(this)));
 
   if (result != net::ERR_IO_PENDING)
     OnSendToCompleted(result);
 }
 
 void PepperUDPSocket::SendRecvFromACKError() {
   PP_NetAddress_Private addr = NetAddressPrivateImpl::kInvalidNetAddress;
   manager_->Send(new PpapiMsg_PPBUDPSocket_RecvFromACK(
       routing_id_, plugin_dispatcher_id_, socket_id_, false, std::string(),
       addr));
@@ skipping 29 matching lines @@
 }
 
 void PepperUDPSocket::OnSendToCompleted(int result) {
   DCHECK(sendto_buffer_.get());
 
   manager_->Send(new PpapiMsg_PPBUDPSocket_SendToACK(
       routing_id_, plugin_dispatcher_id_, socket_id_, true, result));
 
   sendto_buffer_ = NULL;
 }