commit 492eaf5067c88db3477538d935ffb0a0ec0c1936
author Alex Deymo <deymo@google.com> Tue Feb 02 12:05:02 2016 -0800
committer Casey Dahlin <sadmac@google.com> Tue Feb 02 13:34:54 2016 -0800
tree f9bef5a4ba0da1e439d1cded6079f706c418eed0
parent 619d272bd026bbfbd972a7a59278b1325c186da2

client: Fix the build when using the client dbus interface.

Bug: None
TEST=`mmma system/update_engine` on edison-eng with dbus disabled

Change-Id: I8ca9318cd1626f2bb17db15cb4d6c92511e9d970

client_library/client_dbus.cc

diff --git a/client_library/client_dbus.cc b/client_library/client_dbus.cc
index 2579506..270a987 100644
--- a/client_library/client_dbus.cc
+++ b/client_library/client_dbus.cc
@@ -116,7 +116,7 @@
   return proxy_->ResetStatus(nullptr);
 }
 
-void DBusUpdateEngineClient::DBusStatusHandlerRegistered(
+void DBusUpdateEngineClient::DBusStatusHandlersRegistered(
     const string& interface,
     const string& signal_name,
     bool success) const {
@@ -147,7 +147,8 @@
     return;
   }
 
-  for (auto h : handler ? {handler} : handlers_) {
+  std::vector<update_engine::StatusUpdateHandler*> just_handler = {handler};
+  for (auto h : handler ? just_handler : handlers_) {
     h->HandleStatusUpdate(
         last_checked_time, progress, update_status, new_version, new_size);
   }
@@ -199,8 +200,8 @@
   proxy_->RegisterStatusUpdateSignalHandler(
       base::Bind(&DBusUpdateEngineClient::RunStatusUpdateHandlers,
                  base::Unretained(this)),
-      base::Bind(&DBusUpdateEngineClient::StatusUpdateHandlersRegistered,
-                 base::Unretained(this), base::Unretained(nullptr)));
+      base::Bind(&DBusUpdateEngineClient::DBusStatusHandlersRegistered,
+                 base::Unretained(this)));
 
   dbus_handler_registered_ = true;