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

jingle/glue/pseudotcp_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.
 
 #include "jingle/glue/pseudotcp_adapter.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "jingle/glue/thread_wrapper.h"
-#include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/udp/udp_socket.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 
 namespace jingle_glue {
 namespace {
@@ skipping 50 matching lines @@
  private:
   double volume_;
   double rate_;
   double level_;
   base::TimeTicks last_update_;
 };
 
 class FakeSocket : public net::Socket {
  public:
   FakeSocket()
-      : old_read_callback_(NULL),
-        rate_limiter_(NULL),
+      : rate_limiter_(NULL),
         latency_ms_(0) {
   }
   virtual ~FakeSocket() { }
 
   void AppendInputPacket(const std::vector<char>& data) {
     if (rate_limiter_ && rate_limiter_->DropNextPacket())
       return;  // Lose the packet.
 
-    if (old_read_callback_ || !read_callback_.is_null()) {
+    if (!read_callback_.is_null()) {
       int size = std::min(read_buffer_size_, static_cast<int>(data.size()));
       memcpy(read_buffer_->data(), &data[0], data.size());
-      if (old_read_callback_) {
-        net::OldCompletionCallback* cb = old_read_callback_;
-        old_read_callback_ = NULL;
-        read_buffer_ = NULL;
-        cb->Run(size);
-      } else {
-        net::CompletionCallback cb = read_callback_;
-        read_callback_.Reset();
-        read_buffer_ = NULL;
-        cb.Run(size);
-      }
+      net::CompletionCallback cb = read_callback_;
+      read_callback_.Reset();
+      read_buffer_ = NULL;
+      cb.Run(size);
     } else {
       incoming_packets_.push_back(data);
     }
   }
 
   void Connect(FakeSocket* peer_socket) {
     peer_socket_ = peer_socket;
   }
 
   void set_rate_limiter(RateLimiter* rate_limiter) {
     rate_limiter_ = rate_limiter;
   };
 
   void set_latency(int latency_ms) { latency_ms_ = latency_ms; };
 
-  // net::Socket implementation.
+  // net::Socket interface.
   virtual int Read(net::IOBuffer* buf, int buf_len,
-                   net::OldCompletionCallback* callback) {
-    CHECK(!old_read_callback_ && read_callback_.is_null());
+                   const net::CompletionCallback& callback) {
+    CHECK(read_callback_.is_null());
     CHECK(buf);
 
     if (incoming_packets_.size() > 0) {
-      scoped_refptr<net::IOBuffer> buffer(buf);
-      int size = std::min(
-          static_cast<int>(incoming_packets_.front().size()), buf_len);
-      memcpy(buffer->data(), &*incoming_packets_.front().begin(), size);
-      incoming_packets_.pop_front();
-      return size;
-    } else {
-      old_read_callback_ = callback;
-      read_buffer_ = buf;
-      read_buffer_size_ = buf_len;
-      return net::ERR_IO_PENDING;
-    }
-  }
-  virtual int Read(net::IOBuffer* buf, int buf_len,
-                   const net::CompletionCallback& callback) {
-    CHECK(!old_read_callback_ && read_callback_.is_null());
-    CHECK(buf);
-
-    if (incoming_packets_.size() > 0) {
       scoped_refptr<net::IOBuffer> buffer(buf);
       int size = std::min(
           static_cast<int>(incoming_packets_.front().size()), buf_len);
       memcpy(buffer->data(), &*incoming_packets_.front().begin(), size);
       incoming_packets_.pop_front();
       return size;
     } else {
       read_callback_ = callback;
       read_buffer_ = buf;
       read_buffer_size_ = buf_len;
       return net::ERR_IO_PENDING;
     }
   }
 
   virtual int Write(net::IOBuffer* buf, int buf_len,
-                    net::OldCompletionCallback* callback) OVERRIDE {
+                    const net::CompletionCallback& callback) OVERRIDE {
     DCHECK(buf);
     if (peer_socket_) {
       MessageLoop::current()->PostDelayedTask(
           FROM_HERE,
           base::Bind(&FakeSocket::AppendInputPacket,
                      base::Unretained(peer_socket_),
                      std::vector<char>(buf->data(), buf->data() + buf_len)),
           latency_ms_);
     }
 
     return buf_len;
   }
 
   virtual bool SetReceiveBufferSize(int32 size) OVERRIDE {
     NOTIMPLEMENTED();
     return false;
   }
   virtual bool SetSendBufferSize(int32 size) OVERRIDE {
     NOTIMPLEMENTED();
     return false;
   }
 
  private:
   scoped_refptr<net::IOBuffer> read_buffer_;
   int read_buffer_size_;
-  net::OldCompletionCallback* old_read_callback_;
   net::CompletionCallback read_callback_;
 
   std::deque<std::vector<char> > incoming_packets_;
 
   FakeSocket* peer_socket_;
   RateLimiter* rate_limiter_;
   int latency_ms_;
 };
 
 class TCPChannelTester : public base::RefCountedThreadSafe<TCPChannelTester> {
  public:
   TCPChannelTester(MessageLoop* message_loop,
                    net::Socket* client_socket,
                    net::Socket* host_socket)
       : message_loop_(message_loop),
         host_socket_(host_socket),
         client_socket_(client_socket),
         done_(false),
-        ALLOW_THIS_IN_INITIALIZER_LIST(
-            write_cb_(this, &TCPChannelTester::OnWritten)),
-        ALLOW_THIS_IN_INITIALIZER_LIST(
-            read_cb_(this, &TCPChannelTester::OnRead)),
         write_errors_(0),
         read_errors_(0) {
   }
 
   virtual ~TCPChannelTester() { }
 
   void Start() {
     message_loop_->PostTask(
         FROM_HERE, base::Bind(&TCPChannelTester::DoStart, this));
   }
@@ skipping 34 matching lines @@
   }
 
   void DoWrite() {
     int result = 1;
     while (result > 0) {
       if (output_buffer_->BytesRemaining() == 0)
         break;
 
       int bytes_to_write = std::min(output_buffer_->BytesRemaining(),
                                     kMessageSize);
-      result = client_socket_->Write(output_buffer_, bytes_to_write,
-                                     &write_cb_);
+      result = client_socket_->Write(
+          output_buffer_, bytes_to_write,
+          base::Bind(&TCPChannelTester::OnWritten, base::Unretained(this)));
       HandleWriteResult(result);
     }
   }
 
   void OnWritten(int result) {
     HandleWriteResult(result);
     DoWrite();
   }
 
   void HandleWriteResult(int result) {
     if (result <= 0 && result != net::ERR_IO_PENDING) {
       LOG(ERROR) << "Received error " << result << " when trying to write";
       write_errors_++;
       Done();
     } else if (result > 0) {
       output_buffer_->DidConsume(result);
     }
   }
 
   void DoRead() {
     int result = 1;
     while (result > 0) {
       input_buffer_->set_offset(input_buffer_->capacity() - kMessageSize);
 
-      result = host_socket_->Read(input_buffer_, kMessageSize, &read_cb_);
+      result = host_socket_->Read(input_buffer_, kMessageSize,
+                                  base::Bind(&TCPChannelTester::OnRead,
+                                             base::Unretained(this)));
       HandleReadResult(result);
     };
   }
 
   void OnRead(int result) {
     HandleReadResult(result);
     DoRead();
   }
 
   void HandleReadResult(int result) {
@@ skipping 13 matching lines @@
 
  private:
   MessageLoop* message_loop_;
   net::Socket* host_socket_;
   net::Socket* client_socket_;
   bool done_;
 
   scoped_refptr<net::DrainableIOBuffer> output_buffer_;
   scoped_refptr<net::GrowableIOBuffer> input_buffer_;
 
-  net::OldCompletionCallbackImpl<TCPChannelTester> write_cb_;
-  net::OldCompletionCallbackImpl<TCPChannelTester> read_cb_;
   int write_errors_;
   int read_errors_;
 };
 
 class PseudoTcpAdapterTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
     JingleThreadWrapper::EnsureForCurrentThread();
 
     host_socket_ = new FakeSocket();
     client_socket_ = new FakeSocket();
 
     host_socket_->Connect(client_socket_);
     client_socket_->Connect(host_socket_);
 
     host_pseudotcp_.reset(new PseudoTcpAdapter(host_socket_));
     client_pseudotcp_.reset(new PseudoTcpAdapter(client_socket_));
   }
 
   FakeSocket* host_socket_;
   FakeSocket* client_socket_;
 
   scoped_ptr<PseudoTcpAdapter> host_pseudotcp_;
   scoped_ptr<PseudoTcpAdapter> client_pseudotcp_;
   MessageLoop message_loop_;
 };
 
 TEST_F(PseudoTcpAdapterTest, DataTransfer) {
-  TestOldCompletionCallback host_connect_cb;
-  TestOldCompletionCallback client_connect_cb;
+  net::TestCompletionCallback host_connect_cb;
+  net::TestCompletionCallback client_connect_cb;
 
-  int rv1 = host_pseudotcp_->Connect(&host_connect_cb);
-  int rv2 = client_pseudotcp_->Connect(&client_connect_cb);
+  int rv1 = host_pseudotcp_->Connect(host_connect_cb.callback());
+  int rv2 = client_pseudotcp_->Connect(client_connect_cb.callback());
 
   if (rv1 == net::ERR_IO_PENDING)
     rv1 = host_connect_cb.WaitForResult();
   if (rv2 == net::ERR_IO_PENDING)
     rv2 = client_connect_cb.WaitForResult();
   ASSERT_EQ(net::OK, rv1);
   ASSERT_EQ(net::OK, rv2);
 
   scoped_refptr<TCPChannelTester> tester =
       new TCPChannelTester(&message_loop_, host_pseudotcp_.get(),
@@ skipping 10 matching lines @@
   const int kBurstPackets = 10;
 
   LeakyBucket host_limiter(kBurstPackets, kPacketsPerSecond);
   host_socket_->set_latency(kLatencyMs);
   host_socket_->set_rate_limiter(&host_limiter);
 
   LeakyBucket client_limiter(kBurstPackets, kPacketsPerSecond);
   host_socket_->set_latency(kLatencyMs);
   client_socket_->set_rate_limiter(&client_limiter);
 
-  TestOldCompletionCallback host_connect_cb;
-  TestOldCompletionCallback client_connect_cb;
+  net::TestCompletionCallback host_connect_cb;
+  net::TestCompletionCallback client_connect_cb;
 
-  int rv1 = host_pseudotcp_->Connect(&host_connect_cb);
-  int rv2 = client_pseudotcp_->Connect(&client_connect_cb);
+  int rv1 = host_pseudotcp_->Connect(host_connect_cb.callback());
+  int rv2 = client_pseudotcp_->Connect(client_connect_cb.callback());
 
   if (rv1 == net::ERR_IO_PENDING)
     rv1 = host_connect_cb.WaitForResult();
   if (rv2 == net::ERR_IO_PENDING)
     rv2 = client_connect_cb.WaitForResult();
   ASSERT_EQ(net::OK, rv1);
   ASSERT_EQ(net::OK, rv2);
 
   scoped_refptr<TCPChannelTester> tester =
       new TCPChannelTester(&message_loop_, host_pseudotcp_.get(),
@@ skipping 14 matching lines @@
     message_loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask());
   }
   MessageLoop* message_loop_;
   scoped_ptr<PseudoTcpAdapter>* adapter_;
 };
 
 TEST_F(PseudoTcpAdapterTest, DeleteOnConnected) {
   // This test verifies that deleting the adapter mid-callback doesn't lead
   // to deleted structures being touched as the stack unrolls, so the failure
   // mode is a crash rather than a normal test failure.
-  TestOldCompletionCallback client_connect_cb;
+  net::TestCompletionCallback client_connect_cb;
   DeleteOnConnected host_delete(&message_loop_, &host_pseudotcp_);
-  net::OldCompletionCallbackImpl<DeleteOnConnected>
-      host_connect_cb(&host_delete, &DeleteOnConnected::OnConnected);
 
-  host_pseudotcp_->Connect(&host_connect_cb);
-  client_pseudotcp_->Connect(&client_connect_cb);
+  host_pseudotcp_->Connect(base::Bind(&DeleteOnConnected::OnConnected,
+                                      base::Unretained(&host_delete)));
+  client_pseudotcp_->Connect(client_connect_cb.callback());
   message_loop_.Run();
 
   ASSERT_EQ(NULL, host_pseudotcp_.get());
 }
 
 }  // namespace
 
 }  // namespace jingle_glue