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

jingle/glue/channel_socket_adapter_unittest.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.
 

[csilv, 2011/12/09 00:42:00]

nit: include base/bind.h, base/bind_helpers.h

 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "jingle/glue/channel_socket_adapter.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/socket/socket.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/p2p/base/transportchannel.h"
@@ skipping 22 matching lines @@
 
   MOCK_METHOD2(SendPacket, int(const char *data, size_t len));
   MOCK_METHOD2(SetOption, int(talk_base::Socket::Option opt, int value));
   MOCK_METHOD0(GetError, int());
 };
 
 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) {
   }
 
  protected:
   virtual void SetUp() {
     target_.reset(new TransportChannelSocketAdapter(&channel_));
   }
 
   void Callback(int result) {
     callback_result_ = result;
   }
 
   MockTransportChannel channel_;
   scoped_ptr<TransportChannelSocketAdapter> target_;
-  net::OldCompletionCallbackImpl<TransportChannelSocketAdapterTest> callback_;
+  net::CompletionCallback callback_;
   int callback_result_;
   MessageLoopForIO message_loop_;
 };
 
 // Verify that Read() returns net::ERR_IO_PENDING.
 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);
   EXPECT_EQ(kTestDataSize, callback_result_);
 }
 
 // Verify that Read() after Close() returns error.
 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.
 TEST_F(TransportChannelSocketAdapterTest, Write) {
   scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
 
   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);
 }
 
 // Verify that the message is still sent if Write() is called while
 // socket is not open yet. The result is the packet is lost.
 TEST_F(TransportChannelSocketAdapterTest, WritePending) {
   scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
 
   EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize))
       .Times(1)
       .WillOnce(Return(SOCKET_ERROR));
 
   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);
 }
 
 }  // namespace jingle_glue