commit 3e20a2341d0aeb7681e4ee0f89eae6817ade2b3b
author Eric Shienbrood <ers@chromium.org> Thu Feb 16 11:35:56 2012 -0500
committer Gerrit <chrome-bot@google.com> Tue Mar 13 16:40:50 2012 -0700
tree 2029f9835e59182fe5f16c55b7da8f44f0ae9598
parent f33e370ca53d7e74d23066ea9906ad48193ae4dc

shill: Convert code to use the newest version of libchrome.

The biggest change is a switch from using the deprecated
Task and CallbackN mechanisms to using the new Callback
mechanism.

Note: Original CL was https://gerrit.chromium.org/gerrit/16156.
This is logically another patch to that CL, but since the
latter was already merged, and is considered closed by
Gerrit, it's necessary to create a new CL.

BUG=chromium-os:15330
TEST=Build shill and run it on a zgb with a modem. Build and
run unit tests.
CQ-DEPEND=I37628863370323d30cac493764ea28f8ffd42637

Change-Id: I3ae78a3aa44ec167b79f2170d07650ece888254f
Reviewed-on: https://gerrit.chromium.org/gerrit/18030
Reviewed-by: Eric Shienbrood <ers@chromium.org>
Tested-by: Eric Shienbrood <ers@chromium.org>
Commit-Ready: Eric Shienbrood <ers@chromium.org>

dns_client.cc

diff --git a/dns_client.cc b/dns_client.cc
index ee60a29..cbed636 100644
--- a/dns_client.cc
+++ b/dns_client.cc
@@ -15,12 +15,16 @@
 #include <tr1/memory>
 #include <vector>
 
-#include <base/stl_util-inl.h>
+#include <base/bind.h>
+#include <base/bind_helpers.h>
+#include <base/stl_util.h>
 #include <base/string_number_conversions.h>
 
 #include "shill/shill_ares.h"
 #include "shill/shill_time.h"
 
+using base::Bind;
+using base::Unretained;
 using std::map;
 using std::set;
 using std::string;
@@ -53,7 +57,7 @@
                      const vector<string> &dns_servers,
                      int timeout_ms,
                      EventDispatcher *dispatcher,
-                     ClientCallback *callback)
+                     const ClientCallback &callback)
     : address_(IPAddress(family)),
       interface_name_(interface_name),
       dns_servers_(dns_servers),
@@ -62,9 +66,9 @@
       timeout_ms_(timeout_ms),
       running_(false),
       resolver_state_(NULL),
-      read_callback_(NewCallback(this, &DNSClient::HandleDNSRead)),
-      write_callback_(NewCallback(this, &DNSClient::HandleDNSWrite)),
-      task_factory_(this),
+      weak_ptr_factory_(this),
+      read_callback_(Bind(&DNSClient::HandleDNSRead, Unretained(this))),
+      write_callback_(Bind(&DNSClient::HandleDNSWrite, Unretained(this))),
       ares_(Ares::GetInstance()),
       time_(Time::GetInstance()) {}
 
@@ -140,7 +144,7 @@
   }
 
   running_ = false;
-  task_factory_.RevokeAll();
+  weak_ptr_factory_.InvalidateWeakPtrs();
   error_.Reset();
   address_.SetAddressToDefault();
   ares_->Destroy(resolver_state_->channel);
@@ -166,7 +170,7 @@
     error_.Reset();
     address_.SetAddressToDefault();
   }
-  callback_->Run(error, address);
+  callback_.Run(error, address);
 }
 
 void DNSClient::HandleDNSRead(int fd) {
@@ -191,9 +195,9 @@
   }
   VLOG(3) << "In " << __func__;
   running_ = false;
-  task_factory_.RevokeAll();
-  dispatcher_->PostTask(task_factory_.NewRunnableMethod(
-      &DNSClient::HandleCompletion));
+  weak_ptr_factory_.InvalidateWeakPtrs();
+  dispatcher_->PostTask(Bind(&DNSClient::HandleCompletion,
+                             weak_ptr_factory_.GetWeakPtr()));
 
   if (status == ARES_SUCCESS &&
       hostent != NULL &&
@@ -278,7 +282,7 @@
             std::tr1::shared_ptr<IOHandler> (
                 dispatcher_->CreateReadyHandler(sockets[i],
                                                 IOHandler::kModeInput,
-                                                read_callback_.get()));
+                                                read_callback_));
       }
     }
     if (ARES_GETSOCK_WRITABLE(action_bits, i)) {
@@ -289,7 +293,7 @@
             std::tr1::shared_ptr<IOHandler> (
                 dispatcher_->CreateReadyHandler(sockets[i],
                                                 IOHandler::kModeOutput,
-                                                write_callback_.get()));
+                                                write_callback_));
       }
     }
   }
@@ -307,7 +311,7 @@
   timersub(&now, &resolver_state_->start_time_, &elapsed_time);
   timeout_tv.tv_sec = timeout_ms_ / 1000;
   timeout_tv.tv_usec = (timeout_ms_ % 1000) * 1000;
-  task_factory_.RevokeAll();
+  weak_ptr_factory_.InvalidateWeakPtrs();
 
   if (timercmp(&elapsed_time, &timeout_tv, >=)) {
     // There are 3 cases of interest:
@@ -322,8 +326,8 @@
     //    in the posted task.
     running_ = false;
     error_.Populate(Error::kOperationTimeout, kErrorTimedOut);
-    dispatcher_->PostTask(task_factory_.NewRunnableMethod(
-        &DNSClient::HandleCompletion));
+    dispatcher_->PostTask(Bind(&DNSClient::HandleCompletion,
+                               weak_ptr_factory_.GetWeakPtr()));
     return false;
   } else {
     struct timeval max, ret_tv;
@@ -331,7 +335,7 @@
     struct timeval *tv = ares_->Timeout(resolver_state_->channel,
                                         &max, &ret_tv);
     dispatcher_->PostDelayedTask(
-        task_factory_.NewRunnableMethod(&DNSClient::HandleTimeout),
+        Bind(&DNSClient::HandleTimeout, weak_ptr_factory_.GetWeakPtr()),
         tv->tv_sec * 1000 + tv->tv_usec / 1000);
   }