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

net/socket/deterministic_socket_data_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.
 
 #include "net/socket/socket_test_util.h"
 
 #include "testing/platform_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 //-----------------------------------------------------------------------------
@@ skipping 23 matching lines @@
 
   void AssertSyncReadEquals(const char* data, int len);
   void AssertAsyncReadEquals(const char* data, int len);
   void AssertReadReturns(const char* data, int len, int rv);
   void AssertReadBufferEquals(const char* data, int len);
 
   void AssertSyncWriteEquals(const char* data, int len);
   void AssertAsyncWriteEquals(const char* data, int len);
   void AssertWriteReturns(const char* data, int len, int rv);
 
-  TestOldCompletionCallback read_callback_;
-  TestOldCompletionCallback write_callback_;
+  TestCompletionCallback read_callback_;
+  TestCompletionCallback write_callback_;
   StreamSocket* sock_;
   scoped_refptr<DeterministicSocketData> data_;
 
  private:
   scoped_refptr<IOBuffer> read_buf_;
   MockConnect connect_data_;
 
   HostPortPair endpoint_;
   scoped_refptr<TransportSocketParams> tcp_params_;
   ClientSocketPoolHistograms histograms_;
   DeterministicMockClientSocketFactory socket_factory_;
   MockTransportClientSocketPool socket_pool_;
   ClientSocketHandle connection_;
 
   DISALLOW_COPY_AND_ASSIGN(DeterministicSocketDataTest);
 };
 
 DeterministicSocketDataTest::DeterministicSocketDataTest()
-    : read_callback_(),
-      write_callback_(),
-      sock_(NULL),
+    : sock_(NULL),
       data_(NULL),
       read_buf_(NULL),
       connect_data_(false, OK),
       endpoint_("www.google.com", 443),
       tcp_params_(new TransportSocketParams(endpoint_,
                                             LOWEST,
                                             false,
                                             false)),
       histograms_(""),
       socket_pool_(10, 10, &histograms_, &socket_factory_) {
@@ skipping 41 matching lines @@
   data_->RunFor(1);  // Runs 1 step, to cause the callbacks to be invoked
 
   // Now the read should complete
   ASSERT_EQ(len, read_callback_.WaitForResult());
   AssertReadBufferEquals(data, len);
 }
 
 void DeterministicSocketDataTest::AssertReadReturns(const char* data,
                                                     int len, int rv) {
   read_buf_ = new IOBuffer(len);
-  ASSERT_EQ(rv, sock_->Read(read_buf_, len, &read_callback_));
+  ASSERT_EQ(rv, sock_->Read(read_buf_, len, read_callback_.callback()));
 }
 
 void DeterministicSocketDataTest::AssertReadBufferEquals(const char* data,
                                                          int len) {
   ASSERT_EQ(std::string(data, len), std::string(read_buf_->data(), len));
 }
 
 void DeterministicSocketDataTest::AssertSyncWriteEquals(const char* data,
                                                          int len) {
   scoped_refptr<IOBuffer> buf(new IOBuffer(len));
   memcpy(buf->data(), data, len);
 
   // Issue the write, which will complete immediately
-  ASSERT_EQ(len, sock_->Write(buf, len, &write_callback_));
+  ASSERT_EQ(len, sock_->Write(buf, len, write_callback_.callback()));
 }
 
 void DeterministicSocketDataTest::AssertAsyncWriteEquals(const char* data,
                                                          int len) {
   // Issue the read, which will be completed asynchronously
   AssertWriteReturns(data, len, ERR_IO_PENDING);
 
   EXPECT_FALSE(read_callback_.have_result());
   EXPECT_TRUE(sock_->IsConnected());
   data_->RunFor(1);  // Runs 1 step, to cause the callbacks to be invoked
 
   ASSERT_EQ(len, write_callback_.WaitForResult());
 }
 
 void DeterministicSocketDataTest::AssertWriteReturns(const char* data,
                                                      int len, int rv) {
   scoped_refptr<IOBuffer> buf(new IOBuffer(len));
   memcpy(buf->data(), data, len);
 
   // Issue the read, which will complete asynchronously
-  ASSERT_EQ(rv, sock_->Write(buf, len, &write_callback_));
+  ASSERT_EQ(rv, sock_->Write(buf, len, write_callback_.callback()));
 }
 
 // ----------- Read
 
 TEST_F(DeterministicSocketDataTest, SingleSyncReadWhileStopped) {
   MockRead reads[] = {
     MockRead(false, kMsg1, kLen1, 0),  // Sync Read
     MockRead(false, 0, 1),  // EOF
   };
 
@@ skipping 351 matching lines @@
   // Issue the writes which will complete immediately
   data_->StopAfter(1);
   AssertSyncWriteEquals(kMsg3, kLen3);
 
   data_->RunFor(1);
   ASSERT_EQ(kLen2, read_callback_.WaitForResult());
   AssertReadBufferEquals(kMsg2, kLen2);
 }
 
 }  // namespace net