base::Bind: Convert StreamSocket::Connect.

net/socket/transport_client_socket_pool_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/transport_client_socket_pool.h"
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 33 matching lines @@
   CHECK(ParseIPLiteralToNumber("1:abcd::3:4:ff", &number));
   *address = IPEndPoint(number, 80);
 }
 
 class MockClientSocket : public StreamSocket {
  public:
   MockClientSocket(const AddressList& addrlist)
       : connected_(false),
         addrlist_(addrlist) {}
 
-  // StreamSocket methods:
+  // StreamSocket implementation.
   virtual int Connect(OldCompletionCallback* callback) {
     connected_ = true;
     return OK;
   }
+  virtual int Connect(const CompletionCallback& callback) {
+    connected_ = true;
+    return OK;
+  }
   virtual void Disconnect() {
     connected_ = false;
   }
   virtual bool IsConnected() const {
     return connected_;
   }
   virtual bool IsConnectedAndIdle() const {
     return connected_;
   }
   virtual int GetPeerAddress(AddressList* address) const {
@@ skipping 36 matching lines @@
  private:
   bool connected_;
   const AddressList addrlist_;
   BoundNetLog net_log_;
 };
 
 class MockFailingClientSocket : public StreamSocket {
  public:
   MockFailingClientSocket(const AddressList& addrlist) : addrlist_(addrlist) {}
 
-  // StreamSocket methods:
+  // StreamSocket implementation.
   virtual int Connect(OldCompletionCallback* callback) {
     return ERR_CONNECTION_FAILED;
   }
+  virtual int Connect(const net::CompletionCallback& callback) {
+    return ERR_CONNECTION_FAILED;
+  }
 
   virtual void Disconnect() {}
 
   virtual bool IsConnected() const {
     return false;
   }
   virtual bool IsConnectedAndIdle() const {
     return false;
   }
   virtual int GetPeerAddress(AddressList* address) const {
@@ skipping 37 matching lines @@
  public:
   // |should_connect| indicates whether the socket should successfully complete
   // or fail.
   // |should_stall| indicates that this socket should never connect.
   // |delay_ms| is the delay, in milliseconds, before simulating a connect.
   MockPendingClientSocket(
       const AddressList& addrlist,
       bool should_connect,
       bool should_stall,
       int delay_ms)
-      : method_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+      : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
         should_connect_(should_connect),
         should_stall_(should_stall),
         delay_ms_(delay_ms),
         is_connected_(false),
         addrlist_(addrlist) {}
 
-  // StreamSocket methods:
+  // StreamSocket implementation.
   virtual int Connect(OldCompletionCallback* callback) {
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
-        method_factory_.NewRunnableMethod(
-           &MockPendingClientSocket::DoCallback, callback), delay_ms_);
+        base::Bind(&MockPendingClientSocket::DoOldCallback,
+                   weak_factory_.GetWeakPtr(), callback),
+        delay_ms_);
+    return ERR_IO_PENDING;
+  }
+  virtual int Connect(const CompletionCallback& callback) {
+    MessageLoop::current()->PostDelayedTask(
+        FROM_HERE,
+        base::Bind(&MockPendingClientSocket::DoCallback,
+                   weak_factory_.GetWeakPtr(), callback),
+        delay_ms_);
     return ERR_IO_PENDING;
   }
 
   virtual void Disconnect() {}
 
   virtual bool IsConnected() const {
     return is_connected_;
   }
   virtual bool IsConnectedAndIdle() const {
     return is_connected_;
@@ skipping 30 matching lines @@
   }
 
   virtual int Write(IOBuffer* buf, int buf_len,
                     OldCompletionCallback* callback) {
     return ERR_FAILED;
   }
   virtual bool SetReceiveBufferSize(int32 size) { return true; }
   virtual bool SetSendBufferSize(int32 size) { return true; }
 
  private:
-  void DoCallback(OldCompletionCallback* callback) {
+  void DoOldCallback(OldCompletionCallback* callback) {
     if (should_stall_)
       return;
 
     if (should_connect_) {
       is_connected_ = true;
       callback->Run(OK);
     } else {
       is_connected_ = false;
       callback->Run(ERR_CONNECTION_FAILED);
     }
   }
+  void DoCallback(const CompletionCallback& callback) {
+    if (should_stall_)
+      return;
 
-  ScopedRunnableMethodFactory<MockPendingClientSocket> method_factory_;
+    if (should_connect_) {
+      is_connected_ = true;
+      callback.Run(OK);
+    } else {
+      is_connected_ = false;
+      callback.Run(ERR_CONNECTION_FAILED);
+    }
+  }
+
+  base::WeakPtrFactory<MockPendingClientSocket> weak_factory_;
   bool should_connect_;
   bool should_stall_;
   int delay_ms_;
   bool is_connected_;
   const AddressList addrlist_;
   BoundNetLog net_log_;
 };
 
 class MockClientSocketFactory : public ClientSocketFactory {
  public:
@@ skipping 964 matching lines @@
   EXPECT_TRUE(handle.socket());
   IPEndPoint endpoint;
   handle.socket()->GetLocalAddress(&endpoint);
   EXPECT_EQ(kIPv4AddressSize, endpoint.address().size());
   EXPECT_EQ(1, client_socket_factory_.allocation_count());
 }
 
 }  // namespace
 
 }  // namespace net