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

content/browser/renderer_host/p2p/socket_host_test_utils.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TEST_UTILS_H_
 #define CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TEST_UTILS_H_
 
 #include <vector>
 
 #include "content/common/p2p_messages.h"
@@ skipping 39 matching lines @@
   virtual ~FakeSocket();
 
   void AppendInputData(const char* data, int data_size);
   int input_pos() const { return input_pos_; }
   bool read_pending() const { return read_pending_; }
   void SetPeerAddress(const net::IPEndPoint& peer_address);
   void SetLocalAddress(const net::IPEndPoint& local_address);
 
   // net::Socket implementation.
   virtual int Read(net::IOBuffer* buf, int buf_len,
-                   net::OldCompletionCallback* callback) OVERRIDE;
-  virtual int Read(net::IOBuffer* buf, int buf_len,
                    const net::CompletionCallback& callback) OVERRIDE;
   virtual int Write(net::IOBuffer* buf, int buf_len,
-                    net::OldCompletionCallback* callback) OVERRIDE;
+                    const net::CompletionCallback& callback) OVERRIDE;
   virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
   virtual bool SetSendBufferSize(int32 size) OVERRIDE;
-  virtual int Connect(net::OldCompletionCallback* callback) OVERRIDE;
   virtual int Connect(const net::CompletionCallback& callback) OVERRIDE;
   virtual void Disconnect() OVERRIDE;
   virtual bool IsConnected() const OVERRIDE;
   virtual bool IsConnectedAndIdle() const OVERRIDE;
   virtual int GetPeerAddress(net::AddressList* address) const OVERRIDE;
   virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE;
   virtual const net::BoundNetLog& NetLog() const OVERRIDE;
   virtual void SetSubresourceSpeculation() OVERRIDE;
   virtual void SetOmniboxSpeculation() OVERRIDE;
   virtual bool WasEverUsed() const OVERRIDE;
   virtual bool UsingTCPFastOpen() const OVERRIDE;
   virtual int64 NumBytesRead() const OVERRIDE;
   virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
 
  private:
   bool read_pending_;
   scoped_refptr<net::IOBuffer> read_buffer_;
   int read_buffer_size_;
-  net::OldCompletionCallback* old_read_callback_;
   net::CompletionCallback read_callback_;
 
   std::string* written_data_;
   std::string input_data_;
   int input_pos_;
 
   net::IPEndPoint peer_address_;
   net::IPEndPoint local_address_;
 
   net::BoundNetLog net_log_;
@@ skipping 11 matching lines @@
   input_data_.insert(input_data_.end(), data, data + data_size);
   // Complete pending read if any.
   if (read_pending_) {
     read_pending_ = false;
     int result = std::min(read_buffer_size_,
                           static_cast<int>(input_data_.size() - input_pos_));
     CHECK(result > 0);
     memcpy(read_buffer_->data(), &input_data_[0] + input_pos_, result);
     input_pos_ += result;
     read_buffer_ = NULL;
-    if (old_read_callback_) {
-      net::OldCompletionCallback* cb = old_read_callback_;
-      old_read_callback_ = NULL;
-      cb->Run(result);
-    } else {
-      net::CompletionCallback cb = read_callback_;
-      read_callback_.Reset();
-      cb.Run(result);
-    }
+    net::CompletionCallback cb = read_callback_;
+    read_callback_.Reset();
+    cb.Run(result);
   }
 }
 
 void FakeSocket::SetPeerAddress(const net::IPEndPoint& peer_address) {
   peer_address_ = peer_address;
 }
 
 void FakeSocket::SetLocalAddress(const net::IPEndPoint& local_address) {
   local_address_ = local_address;
 }
 
 int FakeSocket::Read(net::IOBuffer* buf, int buf_len,
-                     net::OldCompletionCallback* callback) {
-  DCHECK(buf);
-  if (input_pos_ < static_cast<int>(input_data_.size())){
-    int result = std::min(buf_len,
-                          static_cast<int>(input_data_.size()) - input_pos_);
-    memcpy(buf->data(), &(*input_data_.begin()) + input_pos_, result);
-    input_pos_ += result;
-    return result;
-  } else {
-    read_pending_ = true;
-    read_buffer_ = buf;
-    read_buffer_size_ = buf_len;
-    old_read_callback_ = callback;
-    return net::ERR_IO_PENDING;
-  }
-}
-int FakeSocket::Read(net::IOBuffer* buf, int buf_len,
                      const net::CompletionCallback& callback) {
   DCHECK(buf);
   if (input_pos_ < static_cast<int>(input_data_.size())){
     int result = std::min(buf_len,
                           static_cast<int>(input_data_.size()) - input_pos_);
     memcpy(buf->data(), &(*input_data_.begin()) + input_pos_, result);
     input_pos_ += result;
     return result;
   } else {
     read_pending_ = true;
     read_buffer_ = buf;
     read_buffer_size_ = buf_len;
     read_callback_ = callback;
     return net::ERR_IO_PENDING;
   }
 }
 
 int FakeSocket::Write(net::IOBuffer* buf, int buf_len,
-                      net::OldCompletionCallback* callback) {
+                      const net::CompletionCallback& callback) {
   DCHECK(buf);
   if (written_data_) {
     written_data_->insert(written_data_->end(),
                           buf->data(), buf->data() + buf_len);
   }
   return buf_len;
 }
 
 
 bool FakeSocket::SetReceiveBufferSize(int32 size) {
   NOTIMPLEMENTED();
   return false;
 }
 bool FakeSocket::SetSendBufferSize(int32 size) {
   NOTIMPLEMENTED();
   return false;
 }
 
-int FakeSocket::Connect(net::OldCompletionCallback* callback) {
-  return 0;
-}
-
 int FakeSocket::Connect(const net::CompletionCallback& callback) {
   return 0;
 }
 
 void FakeSocket::Disconnect() {
   NOTREACHED();
 }
 
 bool FakeSocket::IsConnected() const {
   return true;
@@ skipping 97 matching lines @@
     return false;
   P2PMsg_OnIncomingTcpConnection::Param params;
   P2PMsg_OnIncomingTcpConnection::Read(
       arg, &params);
   return params.b == address;
 }
 
 }  // namespace
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TEST_UTILS_H_