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

net/curvecp/curvecp_client_socket.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/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/sys_addrinfo.h"
 #include "net/curvecp/curvecp_client_socket.h"
 #include "net/curvecp/messenger.h"
 
 namespace net {
 
 CurveCPClientSocket::CurveCPClientSocket(const AddressList& addresses,
                                          net::NetLog* net_log,
                                          const net::NetLog::Source& source)
     : addresses_(addresses),
       net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)),
       messenger_(&packetizer_) {
 }
 
 CurveCPClientSocket::~CurveCPClientSocket() {
 }
 
-int CurveCPClientSocket::Connect(OldCompletionCallback* callback) {
+int CurveCPClientSocket::Connect(const CompletionCallback& callback) {
   return packetizer_.Connect(addresses_, &messenger_, callback);
 }
 
-int CurveCPClientSocket::Connect(const net::CompletionCallback& callback) {
-  return packetizer_.Connect(addresses_, &messenger_, callback);
-}
-
 void CurveCPClientSocket::Disconnect() {
   // TODO(mbelshe): DCHECK that we're connected.
   // Record the ConnectionKey so that we can disconnect it properly.
   // Do we need a close() on the messenger?
   // packetizer_.Close();
 }
 
 bool CurveCPClientSocket::IsConnected() const {
   // TODO(mbelshe): return packetizer_.IsConnected();
   return false;
@@ skipping 53 matching lines @@
 int64 CurveCPClientSocket::NumBytesRead() const {
   return -1;
 }
 
 base::TimeDelta CurveCPClientSocket::GetConnectTimeMicros() const {
   return base::TimeDelta::FromMicroseconds(-1);
 }
 
 int CurveCPClientSocket::Read(IOBuffer* buf,
                               int buf_len,
-                              OldCompletionCallback* callback) {
-  return messenger_.Read(buf, buf_len, callback);
-}
-int CurveCPClientSocket::Read(IOBuffer* buf,
-                              int buf_len,
                               const CompletionCallback& callback) {
   return messenger_.Read(buf, buf_len, callback);
 }
 
 int CurveCPClientSocket::Write(IOBuffer* buf,
                                int buf_len,
-                               OldCompletionCallback* callback) {
+                               const CompletionCallback& callback) {
   return messenger_.Write(buf, buf_len, callback);
 }
 
 bool CurveCPClientSocket::SetReceiveBufferSize(int32 size) {
   return true;
 }
 
 bool CurveCPClientSocket::SetSendBufferSize(int32 size) {
   return true;
 }
 
 }  // namespace net