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

webkit/plugins/ppapi/ppb_transport_impl.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 "webkit/plugins/ppapi/ppb_transport_impl.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
@@ skipping 50 matching lines @@
   if (!plugin_instance)
     return NULL;
   return plugin_instance->container()->element().document().frame();
 }
 
 }  // namespace
 
 PPB_Transport_Impl::PPB_Transport_Impl(PP_Instance instance)
     : Resource(instance),
       started_(false),
-      writable_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          channel_write_callback_(this, &PPB_Transport_Impl::OnWritten)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          channel_read_callback_(this, &PPB_Transport_Impl::OnRead)) {
+      writable_(false) {
 }
 
 PPB_Transport_Impl::~PPB_Transport_Impl() {
 }
 
 // static
 PP_Resource PPB_Transport_Impl::Create(PP_Instance instance,
                                        const char* name,
                                        PP_TransportType type) {
   scoped_refptr<PPB_Transport_Impl> t(new PPB_Transport_Impl(instance));
@@ skipping 230 matching lines @@
   net::Socket* channel = p2p_transport_->GetChannel();
   if (!channel)
     return PP_ERROR_FAILED;
 
   PluginModule* plugin_module = ResourceHelper::GetPluginModule(this);
   if (!plugin_module)
     return PP_ERROR_FAILED;
 
   scoped_refptr<net::IOBuffer> buffer =
       new net::WrappedIOBuffer(static_cast<const char*>(data));
-  int result = MapNetError(channel->Read(buffer, len, &channel_read_callback_));
+  int result = MapNetError(
+      channel->Read(buffer, len, base::Bind(&PPB_Transport_Impl::OnRead,
+                                            base::Unretained(this))));
   if (result == PP_OK_COMPLETIONPENDING) {
     recv_callback_ = new TrackedCompletionCallback(
         plugin_module->GetCallbackTracker(), pp_resource(), callback);
   }
 
   return result;
 }
 
 int32_t PPB_Transport_Impl::Send(const void* data, uint32_t len,
                                  PP_CompletionCallback callback) {
   if (!callback.func)
     return PP_ERROR_BLOCKS_MAIN_THREAD;
   if (!p2p_transport_.get())
     return PP_ERROR_FAILED;
 
   if (send_callback_.get() && !send_callback_->completed())
     return PP_ERROR_INPROGRESS;
 
   net::Socket* channel = p2p_transport_->GetChannel();
   if (!channel)
     return PP_ERROR_FAILED;
 
   PluginModule* plugin_module = ResourceHelper::GetPluginModule(this);
   if (!plugin_module)
     return PP_ERROR_FAILED;
 
   scoped_refptr<net::IOBuffer> buffer =
       new net::WrappedIOBuffer(static_cast<const char*>(data));
-  int result = MapNetError(channel->Write(buffer, len,
-                                          &channel_write_callback_));
+  int result = MapNetError(
+      channel->Write(buffer, len, base::Bind(&PPB_Transport_Impl::OnWritten,
+                                             base::Unretained(this))));
   if (result == PP_OK_COMPLETIONPENDING) {
     send_callback_ = new TrackedCompletionCallback(
         plugin_module->GetCallbackTracker(), pp_resource(), callback);
   }
 
   return result;
 }
 
 int32_t PPB_Transport_Impl::Close() {
   if (!p2p_transport_.get())
@@ skipping 47 matching lines @@
 void PPB_Transport_Impl::OnWritten(int result) {
   DCHECK(send_callback_.get() && !send_callback_->completed());
 
   scoped_refptr<TrackedCompletionCallback> callback;
   callback.swap(send_callback_);
   callback->Run(MapNetError(result));
 }
 
 }  // namespace ppapi
 }  // namespace webkit