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/mock_event_dispatcher.h b/mock_event_dispatcher.h
index f30c37d..c55492b 100644
--- a/mock_event_dispatcher.h
+++ b/mock_event_dispatcher.h
@@ -19,15 +19,17 @@
MOCK_METHOD0(DispatchForever, void());
MOCK_METHOD0(DispatchPendingEvents, void());
- MOCK_METHOD1(PostTask, bool(Task *task));
- MOCK_METHOD2(PostDelayedTask, bool(Task *task, int64 delay_ms));
+ MOCK_METHOD1(PostTask, bool(const base::Closure &task));
+ MOCK_METHOD2(PostDelayedTask, bool(const base::Closure &task,
+ int64 delay_ms));
MOCK_METHOD2(CreateInputHandler,
- IOHandler *(int fd, Callback1<InputData *>::Type *callback));
+ IOHandler *(int fd,
+ const base::Callback<void(InputData *)> &callback));
MOCK_METHOD3(CreateReadyHandler,
IOHandler *(int fd,
IOHandler::ReadyMode mode,
- Callback1<int>::Type *callback));
+ const base::Callback<void(int)> &callback));
private:
DISALLOW_COPY_AND_ASSIGN(MockEventDispatcher);