[shill] device, service objects need to register unique paths
BUG=chromium-os:15752
TEST=unit tests
Change-Id: I54a5b1fb3e156fb62ffff0bc49a411135c01a1d0
Reviewed-on: http://gerrit.chromium.org/gerrit/1897
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
diff --git a/service_dbus_adaptor.cc b/service_dbus_adaptor.cc
index cb7e27d..1862294 100644
--- a/service_dbus_adaptor.cc
+++ b/service_dbus_adaptor.cc
@@ -7,20 +7,20 @@
#include <map>
#include <string>
+#include "shill/service.h"
+
using std::map;
using std::string;
namespace shill {
-// TODO(cmasone): Figure out if we should be trying to own sub-interfaces.
// static
const char ServiceDBusAdaptor::kInterfaceName[] = SHILL_INTERFACE;
-// ".Service";
// static
-const char ServiceDBusAdaptor::kPath[] = SHILL_PATH "/Service";
+const char ServiceDBusAdaptor::kPath[] = "/service/";
ServiceDBusAdaptor::ServiceDBusAdaptor(DBus::Connection& conn, Service *service)
- : DBusAdaptor(conn, kPath),
+ : DBusAdaptor(conn, kPath + service->UniqueName()),
service_(service) {}
ServiceDBusAdaptor::~ServiceDBusAdaptor() {}