diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 06:56:23 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 06:56:23 +0000 |
| commit | e20d39fe8164f6633d8224030133a1c6ad18a289 (patch) | |
| tree | d5cd7f78a9307a6eba086c5eedc7dd7fdcea4e82 /dbus/mock_bus.h | |
| parent | 769b082f1fac6e60249c2e6f45bd2432390d7c5a (diff) | |
| download | chromium_src-e20d39fe8164f6633d8224030133a1c6ad18a289.zip chromium_src-e20d39fe8164f6633d8224030133a1c6ad18a289.tar.gz chromium_src-e20d39fe8164f6633d8224030133a1c6ad18a289.tar.bz2 | |
Add Bus::ShutdownOnDBusThreadAndBlock() and remove bus::Shutdown()
This function is intended to use at the the very end of the browser shutdown,
where it it makes more sense to shut down the bus synchronously, than trying
to make it asynchronous.
Remove Bus::Shutdown() as we are unlikely to need it for the production code.
BUG=chromium:90036
TEST=dbus_unittests
Review URL: http://codereview.chromium.org/7830009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus/mock_bus.h')
| -rw-r--r-- | dbus/mock_bus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbus/mock_bus.h b/dbus/mock_bus.h index f1c5b4e..7b949cb 100644 --- a/dbus/mock_bus.h +++ b/dbus/mock_bus.h @@ -25,7 +25,7 @@ class MockBus : public Bus { const std::string& service_name, const std::string& object_path)); MOCK_METHOD0(ShutdownAndBlock, void()); - MOCK_METHOD1(Shutdown, void(OnShutdownCallback callback)); + MOCK_METHOD0(ShutdownOnDBusThreadAndBlock, void()); MOCK_METHOD0(Connect, bool()); MOCK_METHOD1(RequestOwnership, bool(const std::string& service_name)); MOCK_METHOD1(ReleaseOwnership, bool(const std::string& service_name)); |