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

jingle/glue/channel_socket_adapter_unittest.cc

Index: jingle/glue/channel_socket_adapter_unittest.cc
diff --git a/jingle/glue/channel_socket_adapter_unittest.cc b/jingle/glue/channel_socket_adapter_unittest.cc
index e8b34b56195e752f9bacd47e1422c562c648ea8c..7f5f3ee99fdeaa93687ac80789f34a9f300712a2 100644
--- a/jingle/glue/channel_socket_adapter_unittest.cc
+++ b/jingle/glue/channel_socket_adapter_unittest.cc
@@ -44,7 +44,8 @@ class TransportChannelSocketAdapterTest : public testing::Test {
  public:
   TransportChannelSocketAdapterTest()
       : ALLOW_THIS_IN_INITIALIZER_LIST(
-          callback_(this, &TransportChannelSocketAdapterTest::Callback)),
+          callback_(base::Bind(&TransportChannelSocketAdapterTest::Callback,
+                               base::Unretained(this)))),
         callback_result_(0) {
   }
 
@@ -59,7 +60,7 @@ class TransportChannelSocketAdapterTest : public testing::Test {
 
   MockTransportChannel channel_;
   scoped_ptr<TransportChannelSocketAdapter> target_;
-  net::OldCompletionCallbackImpl<TransportChannelSocketAdapterTest> callback_;
+  net::CompletionCallback callback_;
   int callback_result_;
   MessageLoopForIO message_loop_;
 };
@@ -68,7 +69,7 @@ class TransportChannelSocketAdapterTest : public testing::Test {
 TEST_F(TransportChannelSocketAdapterTest, Read) {
   scoped_refptr<IOBuffer> buffer(new IOBuffer(kBufferSize));
 
-  int result = target_->Read(buffer, kBufferSize, &callback_);
+  int result = target_->Read(buffer, kBufferSize, callback_);
   ASSERT_EQ(net::ERR_IO_PENDING, result);
 
   channel_.SignalReadPacket(&channel_, kTestData, kTestDataSize);
@@ -79,14 +80,14 @@ TEST_F(TransportChannelSocketAdapterTest, Read) {
 TEST_F(TransportChannelSocketAdapterTest, ReadClose) {
   scoped_refptr<IOBuffer> buffer(new IOBuffer(kBufferSize));
 
-  int result = target_->Read(buffer, kBufferSize, &callback_);
+  int result = target_->Read(buffer, kBufferSize, callback_);
   ASSERT_EQ(net::ERR_IO_PENDING, result);
 
   target_->Close(kTestError);
   EXPECT_EQ(kTestError, callback_result_);
 
   // All Read() calls after Close() should return the error.
-  EXPECT_EQ(kTestError, target_->Read(buffer, kBufferSize, &callback_));
+  EXPECT_EQ(kTestError, target_->Read(buffer, kBufferSize, callback_));
 }
 
 // Verify that Write sends the packet and returns correct result.
@@ -96,7 +97,7 @@ TEST_F(TransportChannelSocketAdapterTest, Write) {
   EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize))
       .WillOnce(Return(kTestDataSize));
 
-  int result = target_->Write(buffer, kTestDataSize, &callback_);
+  int result = target_->Write(buffer, kTestDataSize, callback_);
   EXPECT_EQ(kTestDataSize, result);
 }
 
@@ -112,7 +113,7 @@ TEST_F(TransportChannelSocketAdapterTest, WritePending) {
   EXPECT_CALL(channel_, GetError())
       .WillOnce(Return(EWOULDBLOCK));
 
-  int result = target_->Write(buffer, kTestDataSize, &callback_);
+  int result = target_->Write(buffer, kTestDataSize, callback_);
   ASSERT_EQ(net::OK, result);
 }