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

remoting/protocol/pepper_stream_channel.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 "remoting/protocol/pepper_stream_channel.h"
 
 #include "base/bind.h"
 #include "crypto/hmac.h"
 #include "jingle/glue/utils.h"
 #include "net/base/cert_status_flags.h"
@@ skipping 27 matching lines @@
 }  // namespace
 
 PepperStreamChannel::PepperStreamChannel(
     PepperSession* session,
     const std::string& name,
     const Session::StreamChannelCallback& callback)
     : session_(session),
       name_(name),
       callback_(callback),
       channel_(NULL),
-      connected_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(p2p_connect_callback_(
-          this, &PepperStreamChannel::OnP2PConnect)) {
+      connected_(false) {
 }
 
 PepperStreamChannel::~PepperStreamChannel() {
   session_->OnDeleteChannel(this);
   // Verify that the |channel_| is ether destroyed or we own it.
   DCHECK_EQ(channel_, owned_channel_.get());
   // Channel should be already destroyed if we were connected.
   DCHECK(!connected_ || channel_ == NULL);
 }
 
@@ skipping 54 matching lines @@
   }
 
   if (transport->SetProperty(PP_TRANSPORTPROPERTY_DISABLE_TCP_TRANSPORT,
                              pp::Var(true)) != PP_OK) {
     LOG(ERROR) << "Failed to set DISABLE_TCP_TRANSPORT flag.";
   }
 
   channel_ = new PepperTransportSocketAdapter(transport, name_, this);
   owned_channel_.reset(channel_);
 
-  int result = channel_->Connect(&p2p_connect_callback_);
+  int result = channel_->Connect(base::Bind(&PepperStreamChannel::OnP2PConnect,
+                                            base::Unretained(this)));
   if (result != net::ERR_IO_PENDING)
     OnP2PConnect(result);
 }
 
 void PepperStreamChannel::AddRemoveCandidate(
     const cricket::Candidate& candidate) {
   DCHECK(CalledOnValidThread());
   if (channel_)
     channel_->AddRemoteCandidate(jingle_glue::SerializeP2PCandidate(candidate));
 }
@@ skipping 59 matching lines @@
 void PepperStreamChannel::NotifyConnectFailed() {
   channel_ = NULL;
   owned_channel_.reset();
   authenticator_.reset();
 
   NotifyConnected(NULL);
 }
 
 }  // namespace protocol
 }  // namespace remoting