apmanager: Fixed dbus paths for consistency with buffet and peerd.
All dbus paths moved from from "/" to "/org/chromium/apmanager/" for consistency
with other components.
"name" in org.chromium.apmanager.Manager set to /org/chromium/apmanager/Manager.
This allow to skip object path creating proxy.
"name" removed from following interfaces as object paths generated in run time:
org.chromium.apmanager.Config.xml
org.chromium.apmanager.Device.xml
org.chromium.apmanager.Service.xml
Fixed xmlns:tp URI.
BUG=chromium:441172
TEST=FEATURES=test emerge-link apmanager
Change-Id: I62e7394a11b1b925776e9cce7ab768d5f9802650
Reviewed-on: https://chromium-review.googlesource.com/234661
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Vitaly Buka <vitalybuka@chromium.org>
Commit-Queue: Vitaly Buka <vitalybuka@chromium.org>
Trybot-Ready: Vitaly Buka <vitalybuka@chromium.org>
Tested-by: Vitaly Buka <vitalybuka@chromium.org>
diff --git a/daemon.cc b/daemon.cc
index 0e38f5e..46882c6 100644
--- a/daemon.cc
+++ b/daemon.cc
@@ -10,17 +10,22 @@
#include <base/logging.h>
#include <base/message_loop/message_loop_proxy.h>
#include <base/run_loop.h>
-#include <chromeos/dbus/service_constants.h>
namespace apmanager {
+namespace {
+const char kAPManagerServiceName[] = "org.chromium.apmanager";
+const char kAPMRootServicePath[] = "/org/chromium/apmanager";
+} // namespace
+
// static
const char Daemon::kAPManagerGroupName[] = "apmanager";
const char Daemon::kAPManagerUserName[] = "apmanager";
Daemon::Daemon(const base::Closure& startup_callback)
- : DBusServiceDaemon(kServiceName, "/"),
- startup_callback_(startup_callback) {}
+ : DBusServiceDaemon(kAPManagerServiceName, kAPMRootServicePath),
+ startup_callback_(startup_callback) {
+}
int Daemon::OnInit() {
int return_code = chromeos::DBusServiceDaemon::OnInit();