Convert UpdateEngineDaemon to a brillo:Daemon.
To help conditionally compile DBus support, we replace the
brillo:DBusDaemon super class with a brillo::Daemon so the DBus
initialization can be skipped.
Bug: 26690086
TEST=mma; deployed on edison.
Change-Id: I2d85feacb28b61e76ffbabc526371c29fac3a424
diff --git a/daemon.h b/daemon.h
index 16f22c7..b6e9edc 100644
--- a/daemon.h
+++ b/daemon.h
@@ -23,7 +23,8 @@
#if USE_WEAVE
#include <brillo/binder_watcher.h>
#endif // USE_WEAVE
-#include <brillo/daemons/dbus_daemon.h>
+#include <brillo/daemons/daemon.h>
+#include <brillo/dbus/dbus_connection.h>
#include "update_engine/common/subprocess.h"
#include "update_engine/dbus_service.h"
@@ -31,7 +32,7 @@
namespace chromeos_update_engine {
-class UpdateEngineDaemon : public brillo::DBusDaemon {
+class UpdateEngineDaemon : public brillo::Daemon {
public:
UpdateEngineDaemon() = default;
~UpdateEngineDaemon();
@@ -45,6 +46,10 @@
// initialization.
void OnDBusRegistered(bool succeeded);
+ // Main D-Bus connection and service adaptor.
+ brillo::DBusConnection dbus_connection_;
+ std::unique_ptr<UpdateEngineAdaptor> dbus_adaptor_;
+
// The Subprocess singleton class requires a brillo::MessageLoop in the
// current thread, so we need to initialize it from this class instead of
// the main() function.
@@ -54,8 +59,6 @@
brillo::BinderWatcher binder_watcher_;
#endif // USE_WEAVE
- std::unique_ptr<UpdateEngineAdaptor> dbus_adaptor_;
-
// The RealSystemState uses the previous classes so it should be defined last.
std::unique_ptr<RealSystemState> real_system_state_;