Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3170)

Unified Diff: dbus/mock_bus.h

Issue 9668018: dbus: remove service name from ExportedObject (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: pay more attention when fixing mock Created 8 years, 9 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dbus/exported_object.cc ('k') | dbus/mock_exported_object.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dbus/mock_bus.h
diff --git a/dbus/mock_bus.h b/dbus/mock_bus.h
index 463790a2bf30ead261c559eb14fffe2e1283a30f..88fc0844bcf2fc9b3cd40c57913a856d1791703d 100644
--- a/dbus/mock_bus.h
+++ b/dbus/mock_bus.h
@@ -26,13 +26,15 @@ class MockBus : public Bus {
ObjectProxy*(const std::string& service_name,
const ObjectPath& object_path,
int options));
- MOCK_METHOD2(GetExportedObject, ExportedObject*(
- const std::string& service_name,
+ MOCK_METHOD1(GetExportedObject, ExportedObject*(
const ObjectPath& object_path));
MOCK_METHOD0(ShutdownAndBlock, void());
MOCK_METHOD0(ShutdownOnDBusThreadAndBlock, void());
MOCK_METHOD0(Connect, bool());
- MOCK_METHOD1(RequestOwnership, bool(const std::string& service_name));
+ MOCK_METHOD2(RequestOwnership, void(
+ const std::string& service_name,
+ OnOwnershipCallback on_ownership_callback));
+ MOCK_METHOD1(RequestOwnershipAndBlock, bool(const std::string& service_name));
MOCK_METHOD1(ReleaseOwnership, bool(const std::string& service_name));
MOCK_METHOD0(SetUpAsyncOperations, bool());
MOCK_METHOD3(SendWithReplyAndBlock, DBusMessage*(DBusMessage* request,
« no previous file with comments | « dbus/exported_object.cc ('k') | dbus/mock_exported_object.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698