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

net/socket/socks5_client_socket_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/socks5_client_socket.h"
 
 #include <algorithm>
 #include <map>
 
 #include "net/base/address_list.h"
@@ skipping 29 matching lines @@
                                       NetLog* net_log);
 
   virtual void SetUp();
 
  protected:
   const uint16 kNwPort;
   CapturingNetLog net_log_;
   scoped_ptr<SOCKS5ClientSocket> user_sock_;
   AddressList address_list_;
   StreamSocket* tcp_sock_;
-  TestOldCompletionCallback callback_;
+  TestCompletionCallback callback_;
   scoped_ptr<MockHostResolver> host_resolver_;
   scoped_ptr<SocketDataProvider> data_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SOCKS5ClientSocketTest);
 };
 
 SOCKS5ClientSocketTest::SOCKS5ClientSocketTest()
   : kNwPort(htons(80)),
     net_log_(CapturingNetLog::kUnbounded),
@@ skipping 15 matching lines @@
 }
 
 SOCKS5ClientSocket* SOCKS5ClientSocketTest::BuildMockSocket(
     MockRead reads[],
     size_t reads_count,
     MockWrite writes[],
     size_t writes_count,
     const std::string& hostname,
     int port,
     NetLog* net_log) {
-  TestOldCompletionCallback callback;
+  TestCompletionCallback callback;
   data_.reset(new StaticSocketDataProvider(reads, reads_count,
                                            writes, writes_count));
   tcp_sock_ = new MockTCPClientSocket(address_list_, net_log, data_.get());
 
-  int rv = tcp_sock_->Connect(&callback);
+  int rv = tcp_sock_->Connect(callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   rv = callback.WaitForResult();
   EXPECT_EQ(OK, rv);
   EXPECT_TRUE(tcp_sock_->IsConnected());
 
   return new SOCKS5ClientSocket(tcp_sock_,
       HostResolver::RequestInfo(HostPortPair(hostname, port)));
 }
 
 // Tests a complete SOCKS5 handshake and the disconnection.
@@ skipping 22 matching lines @@
       MockRead(true, payload_read.data(), payload_read.size()) };
 
   user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
                                    data_writes, arraysize(data_writes),
                                    "localhost", 80, &net_log_));
 
   // At this state the TCP connection is completed but not the SOCKS handshake.
   EXPECT_TRUE(tcp_sock_->IsConnected());
   EXPECT_FALSE(user_sock_->IsConnected());
 
-  int rv = user_sock_->Connect(&callback_);
+  int rv = user_sock_->Connect(callback_.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_FALSE(user_sock_->IsConnected());
 
   net::CapturingNetLog::EntryList net_log_entries;
   net_log_.GetEntries(&net_log_entries);
   EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,
                                     NetLog::TYPE_SOCKS5_CONNECT));
 
   rv = callback_.WaitForResult();
 
   EXPECT_EQ(OK, rv);
   EXPECT_TRUE(user_sock_->IsConnected());
 
   net_log_.GetEntries(&net_log_entries);
   EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
                                   NetLog::TYPE_SOCKS5_CONNECT));
 
   scoped_refptr<IOBuffer> buffer(new IOBuffer(payload_write.size()));
   memcpy(buffer->data(), payload_write.data(), payload_write.size());
-  rv = user_sock_->Write(buffer, payload_write.size(), &callback_);
+  rv = user_sock_->Write(buffer, payload_write.size(), callback_.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   rv = callback_.WaitForResult();
   EXPECT_EQ(static_cast<int>(payload_write.size()), rv);
 
   buffer = new IOBuffer(payload_read.size());
-  rv = user_sock_->Read(buffer, payload_read.size(), &callback_);
+  rv = user_sock_->Read(buffer, payload_read.size(), callback_.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   rv = callback_.WaitForResult();
   EXPECT_EQ(static_cast<int>(payload_read.size()), rv);
   EXPECT_EQ(payload_read, std::string(buffer->data(), payload_read.size()));
 
   user_sock_->Disconnect();
   EXPECT_FALSE(tcp_sock_->IsConnected());
   EXPECT_FALSE(user_sock_->IsConnected());
 }
 
@@ skipping 19 matching lines @@
     };
     MockRead data_reads[] = {
         MockRead(false, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
         MockRead(false, kSOCKS5OkResponse, kSOCKS5OkResponseLength)
     };
 
     user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
                                      data_writes, arraysize(data_writes),
                                      hostname, 80, NULL));
 
-    int rv = user_sock_->Connect(&callback_);
+    int rv = user_sock_->Connect(callback_.callback());
     EXPECT_EQ(OK, rv);
     EXPECT_TRUE(user_sock_->IsConnected());
 
     user_sock_->Disconnect();
     EXPECT_FALSE(user_sock_->IsConnected());
   }
 }
 
 // Test that we fail trying to connect to a hosname longer than 255 bytes.
 TEST_F(SOCKS5ClientSocketTest, LargeHostNameFails) {
   // Create a string of length 256, where each character is 'x'.
   std::string large_host_name;
   std::fill_n(std::back_inserter(large_host_name), 256, 'x');
 
   // Create a SOCKS socket, with mock transport socket.
   MockWrite data_writes[] = {MockWrite()};
   MockRead data_reads[] = {MockRead()};
   user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
                                    data_writes, arraysize(data_writes),
                                    large_host_name, 80, NULL));
 
   // Try to connect -- should fail (without having read/written anything to
   // the transport socket first) because the hostname is too long.
-  TestOldCompletionCallback callback;
-  int rv = user_sock_->Connect(&callback);
+  TestCompletionCallback callback;
+  int rv = user_sock_->Connect(callback.callback());
   EXPECT_EQ(ERR_SOCKS_CONNECTION_FAILED, rv);
 }
 
 TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) {
   const std::string hostname = "www.google.com";
 
   const char kOkRequest[] = {
     0x05,  // Version
     0x01,  // Command (CONNECT)
     0x00,  // Reserved.
@@ skipping 11 matching lines @@
     MockWrite data_writes[] = {
         MockWrite(true, arraysize(partial1)),
         MockWrite(true, partial2, arraysize(partial2)),
         MockWrite(true, kOkRequest, arraysize(kOkRequest)) };
     MockRead data_reads[] = {
         MockRead(true, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
         MockRead(true, kSOCKS5OkResponse, kSOCKS5OkResponseLength) };
     user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
                                      data_writes, arraysize(data_writes),
                                      hostname, 80, &net_log_));
-    int rv = user_sock_->Connect(&callback_);
+    int rv = user_sock_->Connect(callback_.callback());
     EXPECT_EQ(ERR_IO_PENDING, rv);
 
     net::CapturingNetLog::EntryList net_log_entries;
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,
                 NetLog::TYPE_SOCKS5_CONNECT));
 
     rv = callback_.WaitForResult();
     EXPECT_EQ(OK, rv);
     EXPECT_TRUE(user_sock_->IsConnected());
@@ skipping 10 matching lines @@
     MockWrite data_writes[] = {
         MockWrite(true, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
         MockWrite(true, kOkRequest, arraysize(kOkRequest)) };
     MockRead data_reads[] = {
         MockRead(true, partial1, arraysize(partial1)),
         MockRead(true, partial2, arraysize(partial2)),
         MockRead(true, kSOCKS5OkResponse, kSOCKS5OkResponseLength) };
     user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
                                      data_writes, arraysize(data_writes),
                                      hostname, 80, &net_log_));
-    int rv = user_sock_->Connect(&callback_);
+    int rv = user_sock_->Connect(callback_.callback());
     EXPECT_EQ(ERR_IO_PENDING, rv);
 
     net::CapturingNetLog::EntryList net_log_entries;
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,
                                       NetLog::TYPE_SOCKS5_CONNECT));
     rv = callback_.WaitForResult();
     EXPECT_EQ(OK, rv);
     EXPECT_TRUE(user_sock_->IsConnected());
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
                                     NetLog::TYPE_SOCKS5_CONNECT));
   }
 
   // Test for partial handshake request write.
   {
     const int kSplitPoint = 3;  // Break handshake write into two parts.
     MockWrite data_writes[] = {
         MockWrite(true, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength),
         MockWrite(true, kOkRequest, kSplitPoint),
         MockWrite(true, kOkRequest + kSplitPoint,
                   arraysize(kOkRequest) - kSplitPoint)
     };
     MockRead data_reads[] = {
         MockRead(true, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
         MockRead(true, kSOCKS5OkResponse, kSOCKS5OkResponseLength) };
     user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
                                      data_writes, arraysize(data_writes),
                                      hostname, 80, &net_log_));
-    int rv = user_sock_->Connect(&callback_);
+    int rv = user_sock_->Connect(callback_.callback());
     EXPECT_EQ(ERR_IO_PENDING, rv);
     net::CapturingNetLog::EntryList net_log_entries;
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,
                                       NetLog::TYPE_SOCKS5_CONNECT));
     rv = callback_.WaitForResult();
     EXPECT_EQ(OK, rv);
     EXPECT_TRUE(user_sock_->IsConnected());
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
@@ skipping 10 matching lines @@
     MockRead data_reads[] = {
         MockRead(true, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength),
         MockRead(true, kSOCKS5OkResponse, kSplitPoint),
         MockRead(true, kSOCKS5OkResponse + kSplitPoint,
                  kSOCKS5OkResponseLength - kSplitPoint)
     };
 
     user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
                                      data_writes, arraysize(data_writes),
                                      hostname, 80, &net_log_));
-    int rv = user_sock_->Connect(&callback_);
+    int rv = user_sock_->Connect(callback_.callback());
     EXPECT_EQ(ERR_IO_PENDING, rv);
     net::CapturingNetLog::EntryList net_log_entries;
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,
                                       NetLog::TYPE_SOCKS5_CONNECT));
     rv = callback_.WaitForResult();
     EXPECT_EQ(OK, rv);
     EXPECT_TRUE(user_sock_->IsConnected());
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
                                     NetLog::TYPE_SOCKS5_CONNECT));
   }
 }
 
 }  // namespace
 
 }  // namespace net