Remove SystemState dependency from HttpFetcher and InstallPlan.
The SystemState class is an aggregation of all the update_engine
singletons, making it easy to handle cross-dependencies between these
singletons. Nevertheless, since we split the code into a smaller
libpayload_consumer library we need to remove the global dependencies
on the SystemState class from this library and specialize those
dependencies to the actual required class.
Bug: 25773375
TEST=FEATURES=test emerge-link update_engine; mma
Change-Id: I8800157c969db6a8d168f33ac2c6aad4f34fa236
diff --git a/common/libcurl_http_fetcher.h b/common/libcurl_http_fetcher.h
index 9e8abda..df0a7be 100644
--- a/common/libcurl_http_fetcher.h
+++ b/common/libcurl_http_fetcher.h
@@ -31,7 +31,6 @@
#include "update_engine/common/certificate_checker.h"
#include "update_engine/common/hardware_interface.h"
#include "update_engine/common/http_fetcher.h"
-#include "update_engine/system_state.h"
// This is a concrete implementation of HttpFetcher that uses libcurl to do the
// http work.
@@ -41,10 +40,11 @@
class LibcurlHttpFetcher : public HttpFetcher {
public:
LibcurlHttpFetcher(ProxyResolver* proxy_resolver,
- SystemState* system_state,
+ HardwareInterface* hardware,
std::unique_ptr<CertificateChecker> certificate_checker);
- LibcurlHttpFetcher(ProxyResolver* proxy_resolver, SystemState* system_state)
- : LibcurlHttpFetcher(proxy_resolver, system_state, nullptr) {}
+ LibcurlHttpFetcher(ProxyResolver* proxy_resolver,
+ HardwareInterface* hardware)
+ : LibcurlHttpFetcher(proxy_resolver, hardware, nullptr) {}
// Cleans up all internal state. Does not notify delegate
~LibcurlHttpFetcher() override;