Index: dbus/test_service.h |
diff --git a/dbus/test_service.h b/dbus/test_service.h |
index 3ea40db8b66decf4149fb729c596bfe135b17224..6d2540850e5f087af9c2d00443b7952d4aa4ad45 100644 |
--- a/dbus/test_service.h |
+++ b/dbus/test_service.h |
@@ -10,6 +10,7 @@ |
#include "base/memory/ref_counted.h" |
#include "base/threading/thread.h" |
#include "base/synchronization/waitable_event.h" |
+#include "dbus/exported_object.h" |
namespace base { |
class MessageLoopProxy; |
@@ -18,7 +19,6 @@ class MessageLoopProxy; |
namespace dbus { |
class Bus; |
-class ExportedObject; |
class MethodCall; |
class Response; |
@@ -89,14 +89,22 @@ class TestService : public base::Thread { |
// |
// Echos the text message received from the method call. |
- Response* Echo(MethodCall* method_call); |
+ void Echo(MethodCall* method_call, |
+ dbus::ExportedObject::ResponseSender response_sender); |
// Echos the text message received from the method call, but sleeps for |
// TestTimeouts::tiny_timeout_ms() before returning the response. |
- Response* SlowEcho(MethodCall* method_call); |
+ void SlowEcho(MethodCall* method_call, |
+ dbus::ExportedObject::ResponseSender response_sender); |
+ |
+ // Echos the text message received from the method call, but sends its |
+ // response asynchronously after this callback has returned. |
+ void AsyncEcho(MethodCall* method_call, |
+ dbus::ExportedObject::ResponseSender response_sender); |
// Returns NULL, instead of a valid Response. |
- Response* BrokenMethod(MethodCall* method_call); |
+ void BrokenMethod(MethodCall* method_call, |
+ dbus::ExportedObject::ResponseSender response_sender); |
scoped_refptr<base::MessageLoopProxy> dbus_thread_message_loop_proxy_; |
base::WaitableEvent on_all_methods_exported_; |