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_http_request.h b/mock_http_request.h
index b759cc6..6c2d486 100644
--- a/mock_http_request.h
+++ b/mock_http_request.h
@@ -20,8 +20,8 @@
MOCK_METHOD3(Start, HTTPRequest::Result(
const HTTPURL &url,
- Callback1<const ByteString &>::Type *read_event_callback,
- Callback2<Result, const ByteString &>::Type *result_callback));
+ const base::Callback<void(const ByteString &)> &read_event_callback,
+ const base::Callback<void(Result, const ByteString &)> &result_callback));
MOCK_METHOD0(Stop, void());
MOCK_CONST_METHOD0(response_data, const ByteString &());