base::Bind: Convert StreamSocket::Connect.

chrome/browser/chromeos/web_socket_proxy.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 "chrome/browser/chromeos/web_socket_proxy.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <algorithm>
 #include <limits>
 #include <list>
 #include <map>
 #include <vector>
 
 #include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <signal.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/sha1.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/web_socket_proxy_helper.h"
@@ skipping 508 matching lines @@
           const net::HostPortPair host_port_pair,
           int read_pipe,
           int write_pipe)
       : phase_(PHASE_CONNECTING),
         host_port_pair_(host_port_pair),
         inbound_stream_(WebSocketProxy::kBufferLimit),
         outbound_stream_(WebSocketProxy::kBufferLimit),
         read_pipe_(read_pipe),
         write_pipe_(write_pipe),
         method_factory_(this),
-        socket_connect_callback_(NewCallback(this, &SSLChan::OnSocketConnect)),
+        socket_connect_callback_(
+            base::Bind(&SSLChan::OnSocketConnect, base::Unretained(this))),
         ssl_handshake_callback_(
-            NewCallback(this, &SSLChan::OnSSLHandshakeCompleted)),
+            base::Bind(&SSLChan::OnSSLHandshakeCompleted,
+                       base::Unretained(this))),
         socket_read_callback_(NewCallback(this, &SSLChan::OnSocketRead)),
         socket_write_callback_(NewCallback(this, &SSLChan::OnSocketWrite)) {
     if (!SetNonBlock(read_pipe_) || !SetNonBlock(write_pipe_)) {
       Shut(net::ERR_UNEXPECTED);
       return;
     }
     net::ClientSocketFactory* factory =
         net::ClientSocketFactory::GetDefaultFactory();
     socket_.reset(factory->CreateTransportClientSocket(
         address_list, NULL, net::NetLog::Source()));
     if (socket_ == NULL) {
       Shut(net::ERR_FAILED);
       return;
     }
-    int result = socket_->Connect(socket_connect_callback_.get());
+    int result = socket_->Connect(socket_connect_callback_);
     if (result != net::ERR_IO_PENDING)
       OnSocketConnect(result);
   }
 
   ~SSLChan() {
     phase_ = PHASE_CLOSED;
     write_pipe_controller_.StopWatchingFileDescriptor();
     read_pipe_controller_.StopWatchingFileDescriptor();
     close(write_pipe_);
     close(read_pipe_);
@@ skipping 39 matching lines @@
     if (!cert_verifier_.get())
       cert_verifier_.reset(new net::CertVerifier());
     ssl_context.cert_verifier = cert_verifier_.get();
     socket_.reset(factory->CreateSSLClientSocket(
         handle, host_port_pair_, ssl_config_, NULL, ssl_context));
     if (!socket_.get()) {
       LOG(WARNING) << "Failed to create an SSL client socket.";
       OnSSLHandshakeCompleted(net::ERR_UNEXPECTED);
       return;
     }
-    result = socket_->Connect(ssl_handshake_callback_.get());
+    result = socket_->Connect(ssl_handshake_callback_);
     if (result != net::ERR_IO_PENDING)
       OnSSLHandshakeCompleted(result);
   }
 
   void OnSSLHandshakeCompleted(int result) {
     if (result) {
       Shut(result);
       return;
     }
     is_socket_read_pending_ = false;
@@ skipping 140 matching lines @@
   net::SSLConfig ssl_config_;
   IOBufferQueue inbound_stream_;
   IOBufferQueue outbound_stream_;
   int read_pipe_;
   int write_pipe_;
   bool is_socket_read_pending_;
   bool is_socket_write_pending_;
   bool is_read_pipe_blocked_;
   bool is_write_pipe_blocked_;
   ScopedRunnableMethodFactory<SSLChan> method_factory_;
-  scoped_ptr<net::OldCompletionCallback> socket_connect_callback_;
-  scoped_ptr<net::OldCompletionCallback> ssl_handshake_callback_;
+  net::CompletionCallback socket_connect_callback_;
+  net::CompletionCallback ssl_handshake_callback_;
   scoped_ptr<net::OldCompletionCallback> socket_read_callback_;
   scoped_ptr<net::OldCompletionCallback> socket_write_callback_;
   MessageLoopForIO::FileDescriptorWatcher read_pipe_controller_;
   MessageLoopForIO::FileDescriptorWatcher write_pipe_controller_;
 
   friend class DeleteTask<SSLChan>;
   DISALLOW_COPY_AND_ASSIGN(SSLChan);
 };
 
 Serv::Serv(const std::vector<std::string>& allowed_origins)
@@ skipping 1107 matching lines @@
 
 void WebSocketProxy::Shutdown() {
   static_cast<Serv*>(impl_)->Shutdown();
 }
 
 void WebSocketProxy::OnNetworkChange() {
   static_cast<Serv*>(impl_)->OnNetworkChange();
 }
 
 }  // namespace chromeos