commit 299128ee0f9009f79a62d5f57d75270f62353c9d
author Sen Jiang <senj@google.com> Fri Jun 03 17:48:18 2016 -0700
committer Sen Jiang <senj@google.com> Mon Jun 13 13:27:54 2016 -0700
tree eee279a994592dcb2046b4dfeaa2f54c94983fb7
parent b6eef73e20736b4b6a43611fa732d8bba72ff7ff

Make DBus a singleton.

All the proxies need dbus to initialize, so we are passing dbus around,
to make it easier to compile dbus conditionally, this patch makes it a
singleton so that the proxies can get dbus on their own.

Test: mma
Bug: 28800946

Change-Id: Idf062c843aa34a431c2201bae5b895dc1d0ea787

dbus_service.h

diff --git a/dbus_service.h b/dbus_service.h
index 12f8cf1..8b25d43 100644
--- a/dbus_service.h
+++ b/dbus_service.h
@@ -147,8 +147,7 @@
 class UpdateEngineAdaptor : public org::chromium::UpdateEngineInterfaceAdaptor,
                             public ServiceObserverInterface {
  public:
-  UpdateEngineAdaptor(SystemState* system_state,
-                      const scoped_refptr<dbus::Bus>& bus);
+  UpdateEngineAdaptor(SystemState* system_state);
   ~UpdateEngineAdaptor() = default;
 
   // Register the DBus object with the update engine service asynchronously.