base::Bind: Convert Socket::Read.

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>
 
@@ skipping 537 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_(
-            base::Bind(&SSLChan::OnSocketConnect, base::Unretained(this))),
-        ssl_handshake_callback_(
+        ALLOW_THIS_IN_INITIALIZER_LIST(socket_connect_callback_(
+            base::Bind(&SSLChan::OnSocketConnect, base::Unretained(this)))),
+        ALLOW_THIS_IN_INITIALIZER_LIST(ssl_handshake_callback_(
             base::Bind(&SSLChan::OnSSLHandshakeCompleted,
-                       base::Unretained(this))),
-        socket_read_callback_(NewCallback(this, &SSLChan::OnSocketRead)),
+                       base::Unretained(this)))),
+        ALLOW_THIS_IN_INITIALIZER_LIST(socket_read_callback_(
+            base::Bind(&SSLChan::OnSocketRead, base::Unretained(this)))),
         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) {
@@ skipping 151 matching lines @@
             DCHECK_LT(rv, 0);
             Shut(net::ERR_UNEXPECTED);
             return;
           }
         }
       }
       if (!is_socket_read_pending_ && phase_ == PHASE_RUNNING) {
         scoped_refptr<net::IOBufferWithSize> buf =
             inbound_stream_.GetIOBufferToFill();
         if (buf && buf->size() > 0) {
-          int rv = socket_->Read(buf, buf->size(), socket_read_callback_.get());
+          int rv = socket_->Read(buf, buf->size(), socket_read_callback_);
           is_socket_read_pending_ = true;
           if (rv != net::ERR_IO_PENDING) {
             MessageLoop::current()->PostTask(FROM_HERE,
                 method_factory_.NewRunnableMethod(&SSLChan::OnSocketRead, rv));
           }
         }
       }
       if (!is_socket_write_pending_) {
         scoped_refptr<net::IOBufferWithSize> buf =
             outbound_stream_.GetIOBufferToProcess();
@@ skipping 42 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_;
   net::CompletionCallback socket_connect_callback_;

[James Hawkins, 2011/12/07 00:01:57]

#include "net/base/completion_callback.h"

[James Hawkins, 2011/12/07 00:08:11]

Done.

   net::CompletionCallback ssl_handshake_callback_;
-  scoped_ptr<net::OldCompletionCallback> socket_read_callback_;
+  net::CompletionCallback 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)
     : allowed_origins_(allowed_origins),
@@ skipping 1106 matching lines @@
 
 void WebSocketProxy::Shutdown() {
   static_cast<Serv*>(impl_)->Shutdown();
 }
 
 void WebSocketProxy::OnNetworkChange() {
   static_cast<Serv*>(impl_)->OnNetworkChange();
 }
 
 }  // namespace chromeos