summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc
diff options
context:
space:
mode:
authorkeybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-10 01:12:52 +0000
committerkeybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-10 01:12:52 +0000
commit15e7b16ff24684e2678fe1b4964125b42a4c4018 (patch)
tree5f53e19b8a27e5af437e342d5464b110f4980a48 /chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc
parent093fcf536f77186f754119854ab729e68c31f784 (diff)
downloadchromium_src-15e7b16ff24684e2678fe1b4964125b42a4c4018.zip
chromium_src-15e7b16ff24684e2678fe1b4964125b42a4c4018.tar.gz
chromium_src-15e7b16ff24684e2678fe1b4964125b42a4c4018.tar.bz2
dbus: remove service name from ExportedObject
Well-known names in D-Bus are merely aliases to unique connection ids maintained by the bus, they have no purpose in qualifying object paths or interfaces and it's perfectly legimiate for a client to make requests to the unique connection id (e.g. in response to a signal, which does not reference the well-known name of the origin connection). Remove the service_name member from dbus::ExportedObject, from its constructor and from dbus::Bus::GetExportedObject and require code to call dbus::Bus::RequestOwnership if a well-known name is desired. This requires making that function callable from the origin thread with a callback for the return value. BUG=chromium-os:27101 TEST=dbus_unittests Change-Id: Ib91de8b68ad9c3b432e224a2c715f0c2ca1af463 Review URL: http://codereview.chromium.org/9668018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc')
-rw-r--r--chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc b/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc
index 3dc6359..cb62417 100644
--- a/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc
+++ b/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc
@@ -48,13 +48,12 @@ class CrosDBusServiceTest : public testing::Test {
// org.chromium.CrosDBusService.
mock_exported_object_ =
new dbus::MockExportedObject(mock_bus_.get(),
- kLibCrosServiceName,
dbus::ObjectPath(kLibCrosServicePath));
// |mock_bus_|'s GetExportedObject() will return mock_exported_object_|
// for the given service name and the object path.
EXPECT_CALL(*mock_bus_, GetExportedObject(
- kLibCrosServiceName, dbus::ObjectPath(kLibCrosServicePath)))
+ dbus::ObjectPath(kLibCrosServicePath)))
.WillOnce(Return(mock_exported_object_.get()));
// Create a mock proxy resolution service.