dbus/mock_bus.h - Issue 7830009: Add Bus::ShutdownOnDBusThreadAndBlock() and remove bus::Shutdown()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: dbus/mock_bus.h

Issue 7830009: Add Bus::ShutdownOnDBusThreadAndBlock() and remove bus::Shutdown() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: address comments Created 9 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: dbus/mock_bus.h

diff --git a/dbus/mock_bus.h b/dbus/mock_bus.h

index f1c5b4e7a628b054469e2de0212a06695d6ac5a3..7b949cbe5df54f0c6e9f5da18ae1bbe6c28f454e 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));

« no previous file with comments | « dbus/end_to_end_sync_unittest.cc ('k') | dbus/test_service.h » ('j') | no next file with comments »