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>
diff --git a/routing_table_unittest.cc b/routing_table_unittest.cc
index 6e36cb5..27faba4 100644
--- a/routing_table_unittest.cc
+++ b/routing_table_unittest.cc
@@ -6,7 +6,7 @@
#include <linux/rtnetlink.h>
#include <base/logging.h>
-#include <base/stl_util-inl.h>
+#include <base/stl_util.h>
#include <gtest/gtest.h>
#include <gmock/gmock.h>
@@ -18,6 +18,7 @@
#include "shill/rtnl_handler.h"
#include "shill/rtnl_message.h"
+using base::Callback;
using testing::_;
using testing::Invoke;
using testing::Return;
@@ -30,7 +31,7 @@
public:
virtual IOHandler *CreateInputHandler(
int /*fd*/,
- Callback1<InputData*>::Type */*callback*/) {
+ const Callback<void(InputData*)> &/*callback*/) {
return NULL;
}
};