base::Bind: Convert most of net/http.

net/tools/fetch/fetch_client.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 "build/build_config.h"
 
 #include "base/at_exit.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/completion_callback.h"
 #include "net/base/host_resolver.h"
 #include "net/base/io_buffer.h"
@@ skipping 31 matching lines @@
   int clients_;
 };
 
 static base::LazyInstance<Driver> g_driver = LAZY_INSTANCE_INITIALIZER;
 
 // A network client
 class Client {
  public:
   Client(net::HttpTransactionFactory* factory, const std::string& url) :
       url_(url),
-      buffer_(new net::IOBuffer(kBufferSize)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          connect_callback_(this, &Client::OnConnectComplete)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          read_callback_(this, &Client::OnReadComplete)) {
+      buffer_(new net::IOBuffer(kBufferSize)) {
     int rv = factory->CreateTransaction(&transaction_);
     DCHECK_EQ(net::OK, rv);
     buffer_->AddRef();
     g_driver.Get().ClientStarted();
     request_info_.url = url_;
     request_info_.method = "GET";
     int state = transaction_->Start(
-        &request_info_, &connect_callback_, net::BoundNetLog());
+        &request_info_,
+        base::Bind(&Client::OnConnectComplete, base::Unretained(this)),
+        net::BoundNetLog());
     DCHECK(state == net::ERR_IO_PENDING);
   };
 
  private:
   void OnConnectComplete(int result) {
     // Do work here.
-    int state = transaction_->Read(buffer_.get(), kBufferSize, &read_callback_);
+    int state = transaction_->Read(
+        buffer_.get(), kBufferSize,
+        base::Bind(&Client::OnReadComplete, base::Unretained(this)));
     if (state == net::ERR_IO_PENDING)
       return;  // IO has started.
     if (state < 0)
       return;  // ERROR!
     OnReadComplete(state);
   }
 
   void OnReadComplete(int result) {
     if (result == 0) {
       OnRequestComplete(result);
       return;
     }
 
     // Deal with received data here.
     base::StatsCounter bytes_read("FetchClient.bytes_read");
     bytes_read.Add(result);
 
     // Issue a read for more data.
-    int state = transaction_->Read(buffer_.get(), kBufferSize, &read_callback_);
+    int state = transaction_->Read(
+        buffer_.get(), kBufferSize,
+        base::Bind(&Client::OnReadComplete, base::Unretained(this)));
     if (state == net::ERR_IO_PENDING)
       return;  // IO has started.
     if (state < 0)
       return;  // ERROR!
     OnReadComplete(state);
   }
 
   void OnRequestComplete(int result) {
     base::StatsCounter requests("FetchClient.requests");
     requests.Increment();
     g_driver.Get().ClientStopped();
     printf(".");
   }
 
   static const int kBufferSize = (16 * 1024);
   GURL url_;
   net::HttpRequestInfo request_info_;
   scoped_ptr<net::HttpTransaction> transaction_;
   scoped_refptr<net::IOBuffer> buffer_;
-  net::OldCompletionCallbackImpl<Client> connect_callback_;
-  net::OldCompletionCallbackImpl<Client> read_callback_;
 };
 
 int main(int argc, char** argv) {
   base::AtExitManager exit;
   base::StatsTable table("fetchclient", 50, 1000);
   table.set_current(&table);
 
   CommandLine::Init(argc, argv);
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   std::string url = parsed_command_line.GetSwitchValueASCII("url");
@@ skipping 84 matching lines @@
       std::string name(table.GetRowName(index));
       if (name.length() > 0) {
         int value = table.GetRowValue(index);
         printf("%s:\t%d\n", name.c_str(), value);
       }
     }
     printf("</stats>\n");
   }
   return 0;
 }