update_engine: Use org.chromium.NetworkProxyService.
Make update_engine call Chrome's new
org.chromium.NetworkProxyService D-Bus service to resolve
network proxies instead of using
org.chromium.LibCrosService. The new service supports
asynchronous replies instead of responding via D-Bus
signals.
BUG=chromium:446115,chromium:703217
TEST=unit tests pass; also added debug logging and verified
that chrome's proxy settings are used
(cherry picked from commit 941cf235c5e56eddc6e4f2de2f38bee032a4dead)
Cherry-pick updated to resolve conflicts with existing code in AOSP.
Change-Id: I8c0704482e9988fe9ed14d32797b3a5b8da3d46a
Reviewed-on: https://chromium-review.googlesource.com/497491
Commit-Ready: Dan Erat <derat@chromium.org>
Tested-by: Dan Erat <derat@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
diff --git a/update_attempter.cc b/update_attempter.cc
index 2cc5308..6a7853d 100644
--- a/update_attempter.cc
+++ b/update_attempter.cc
@@ -120,14 +120,16 @@
return code;
}
-UpdateAttempter::UpdateAttempter(SystemState* system_state,
- CertificateChecker* cert_checker,
- LibCrosProxy* libcros_proxy)
+UpdateAttempter::UpdateAttempter(
+ SystemState* system_state,
+ CertificateChecker* cert_checker,
+ org::chromium::NetworkProxyServiceInterfaceProxyInterface*
+ network_proxy_service_proxy)
: processor_(new ActionProcessor()),
system_state_(system_state),
#if USE_LIBCROS
cert_checker_(cert_checker),
- chrome_proxy_resolver_(libcros_proxy) {
+ chrome_proxy_resolver_(network_proxy_service_proxy) {
#else
cert_checker_(cert_checker) {
#endif // USE_LIBCROS
@@ -158,10 +160,6 @@
status_ = UpdateStatus::UPDATED_NEED_REBOOT;
else
status_ = UpdateStatus::IDLE;
-
-#if USE_LIBCROS
- chrome_proxy_resolver_.Init();
-#endif // USE_LIBCROS
}
void UpdateAttempter::ScheduleUpdates() {