Revert 113699 - base::Bind: Convert Socket::Write.

net/socket/web_socket_server_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/web_socket_server_socket.h"
 
 #include <stdlib.h>
 #include <algorithm>
 
 #include "base/callback_old.h"
@@ skipping 139 matching lines @@
     int lot = std::min(remaining, buf_len);
     if (GetRand(0, 1))
       lot = GetRand(1, lot);
     std::copy(buf->data(), buf->data() + lot, answer_->data());
     answer_->DidConsume(lot);
     if (GetRand(0, 1)) {
       return lot;
     }
     MessageLoop::current()->PostTask(FROM_HERE,
         method_factory_.NewRunnableMethod(
-            &TestingTransportSocket::DoOldWriteCallback, callback, lot));
-    return net::ERR_IO_PENDING;
-  }
-  virtual int Write(net::IOBuffer* buf, int buf_len,
-                    const net::CompletionCallback& callback) {
-    CHECK_GT(buf_len, 0);
-    int remaining = answer_->BytesRemaining();
-    CHECK_GE(remaining, buf_len);
-    int lot = std::min(remaining, buf_len);
-    if (GetRand(0, 1))
-      lot = GetRand(1, lot);
-    std::copy(buf->data(), buf->data() + lot, answer_->data());
-    answer_->DidConsume(lot);
-    if (GetRand(0, 1)) {
-      return lot;
-    }
-    MessageLoop::current()->PostTask(FROM_HERE,
-        method_factory_.NewRunnableMethod(
             &TestingTransportSocket::DoWriteCallback, callback, lot));
     return net::ERR_IO_PENDING;
   }
 
   virtual bool SetReceiveBufferSize(int32 size) {
     return true;
   }
 
   virtual bool SetSendBufferSize(int32 size) {
     return true;
@@ skipping 15 matching lines @@
     if (result == 0 && !is_closed_) {
       MessageLoop::current()->PostTask(FROM_HERE,
           method_factory_.NewRunnableMethod(
               &TestingTransportSocket::DoReadCallback, callback, 0));
     } else {
       if (!callback.is_null())
         callback.Run(result);
     }
   }
 
-  void DoOldWriteCallback(net::OldCompletionCallback* callback, int result) {
+  void DoWriteCallback(net::OldCompletionCallback* callback, int result) {
     if (callback)
       callback->Run(result);
   }
-  void DoWriteCallback(const net::CompletionCallback& callback, int result) {
-    if (!callback.is_null())
-      callback.Run(result);
-  }
 
   bool is_closed_;
 
   // Data to return for Read requests.
   scoped_refptr<net::DrainableIOBuffer> sample_;
 
   // Data pushed to us by server socket (using Write calls).
   scoped_refptr<net::DrainableIOBuffer> answer_;
 
   // Final read callback to report zero (zero stands for EOF).
@@ skipping 416 matching lines @@
   MessageLoop::current()->RunAllPending();
 
   for (size_t i = kill_list.size(); i--;)
     delete kill_list[i];
   for (size_t i = tracker_list.size(); i--;)
     delete tracker_list[i];
   MessageLoop::current()->RunAllPending();
 }
 
 }  // namespace net