commit efe9df5bf7fd906c1dad13f0e00cfd27ad190dac
author Christopher Wiley <wiley@chromium.org> Thu Mar 12 16:02:22 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Sun Mar 15 02:41:42 2015 +0000
tree bff82907f48b9655effb9147c76ead66ca768965
parent 1b6aa986ce3143dd2fe9c9ccc180f8ea9afba1e5

chromeos-dbus-bindings: Correct ObjectManager without service name

We need to store the passed in service name and pass it to proxies
we create when not configured with a service name in the dbus config.

BUG=brillo:581
TEST=leaderd changes which depend on this compile, unittests.

Change-Id: Id53f3a0c45ac64d477ba1d723952679cc3eb1b29
Reviewed-on: https://chromium-review.googlesource.com/260014
Tested-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Christopher Wiley <wiley@chromium.org>

chromeos-dbus-bindings/proxy_generator.h

diff --git a/chromeos-dbus-bindings/proxy_generator.h b/chromeos-dbus-bindings/proxy_generator.h
index aa9e89e..5dc04c9 100644
--- a/chromeos-dbus-bindings/proxy_generator.h
+++ b/chromeos-dbus-bindings/proxy_generator.h
@@ -146,7 +146,8 @@
                                      IndentedText* text);
 
     // Generates ObjectAdded() method.
-    static void AddObjectAdded(const std::vector<Interface>& interfaces,
+    static void AddObjectAdded(const ServiceConfig& config,
+                               const std::vector<Interface>& interfaces,
                                IndentedText* text);
 
     // Generates ObjectRemoved() method.
@@ -159,7 +160,8 @@
                                     IndentedText* text);
 
     // Generates data members of the class.
-    static void AddDataMembers(const std::vector<Interface>& interfaces,
+    static void AddDataMembers(const ServiceConfig& config,
+                               const std::vector<Interface>& interfaces,
                                const std::string& class_name,
                                IndentedText* text);
   };