commit a82b7111f2b0515a8d79e6e8034836a5d1342468
author Chris Masone <cmasone@chromium.org> Wed May 25 15:16:29 2011 -0700
committer Chris Masone <cmasone@chromium.org> Thu Jun 02 10:37:10 2011 -0700
tree e0603ae9f151fe984ca63e69a13471dc84f4a72e
parent 50308cd0cc10594b9f50fc4191ba4e9bd1fec0e5

[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>

device_dbus_adaptor.cc

diff --git a/device_dbus_adaptor.cc b/device_dbus_adaptor.cc
index 2626023..a164d53 100644
--- a/device_dbus_adaptor.cc
+++ b/device_dbus_adaptor.cc
@@ -8,19 +8,20 @@
 #include <map>
 #include <string>
 
+#include "shill/device.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 DeviceDBusAdaptor::kInterfaceName[] = SHILL_INTERFACE;  // ".Device";
+const char DeviceDBusAdaptor::kInterfaceName[] = SHILL_INTERFACE;
 // static
-const char DeviceDBusAdaptor::kPath[] = SHILL_PATH "/Device";
+const char DeviceDBusAdaptor::kPath[] = "/device/";
 
 DeviceDBusAdaptor::DeviceDBusAdaptor(DBus::Connection& conn, Device *device)
-    : DBusAdaptor(conn, string(kPath) + string("/") + device->Name()),
+    : DBusAdaptor(conn, kPath + device->UniqueName()),
       device_(device) {
 }
 DeviceDBusAdaptor::~DeviceDBusAdaptor() {}