Retry 114494 - Remove BindStateHolder and have Bind() return a Callback<> object directly."

net/socket/web_socket_server_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/socket/web_socket_server_socket.h"
 
 #include <algorithm>
 #include <deque>
 #include <limits>
 #include <map>
@@ skipping 303 matching lines @@
     return transport_socket_->SetSendBufferSize(size);
   }
 
   // WebSocketServerSocket implementation.
   virtual int Accept(net::OldCompletionCallback* callback) {
     if (phase_ != PHASE_NYMPH)
       return net::ERR_UNEXPECTED;
     phase_ = PHASE_HANDSHAKE;
     net::CompletionCallback cb;
     if (callback) {
-      cb = base::Bind(&net::OldCompletionCallback::Run<int>,
-                      base::Unretained(callback));
+      cb = base::Bind(&net::OldCompletionCallbackAdapter, callback);
     }
     pending_reqs_.push_front(PendingReq(
         PendingReq::TYPE_READ_METADATA, fill_handshake_buf_.get(),
         cb));
     ConsiderTransportRead();
     return net::ERR_IO_PENDING;
   }
 
   std::deque<PendingReq>::iterator GetPendingReq(PendingReq::Type type) {
     for (std::deque<PendingReq>::iterator it = pending_reqs_.begin();
@@ skipping 560 matching lines @@
 
 WebSocketServerSocket* CreateWebSocketServerSocket(
     Socket* transport_socket, WebSocketServerSocket::Delegate* delegate) {
   return new WebSocketServerSocketImpl(transport_socket, delegate);
 }
 
 WebSocketServerSocket::~WebSocketServerSocket() {
 }
 
 }  // namespace net;