Chromium Code Reviews| Index: dbus/test_service.cc |
| diff --git a/dbus/test_service.cc b/dbus/test_service.cc |
| index b0207b0e7e9afb14ae4cd1033766855f12b3cdff..2af1caec461286ebaeb35e8ce8360aa4b8982e24 100644 |
| --- a/dbus/test_service.cc |
| +++ b/dbus/test_service.cc |
| @@ -163,25 +163,30 @@ void TestService::Run(MessageLoop* message_loop) { |
| message_loop->Run(); |
| } |
| -Response* TestService::Echo(MethodCall* method_call) { |
| +void TestService::Echo(MethodCall* method_call, |
| + dbus::ExportedObject::ResponseSender response_sender) { |
| MessageReader reader(method_call); |
| std::string text_message; |
| - if (!reader.PopString(&text_message)) |
| - return NULL; |
| + if (!reader.PopString(&text_message)) { |
| + response_sender.Run(NULL); |
| + return; |
| + } |
| Response* response = Response::FromMethodCall(method_call); |
| MessageWriter writer(response); |
| writer.AppendString(text_message); |
| - return response; |
| + response_sender.Run(response); |
| } |
| -Response* TestService::SlowEcho(MethodCall* method_call) { |
| +void TestService::SlowEcho(MethodCall* method_call, |
| + dbus::ExportedObject::ResponseSender response_sender) { |
|
satorux1
2011/11/22 23:55:39
In this case, the following is preferable:
void T
Vince Laviano
2011/11/23 00:04:24
Done.
|
| base::PlatformThread::Sleep(TestTimeouts::tiny_timeout_ms()); |
| - return Echo(method_call); |
| + Echo(method_call, response_sender); |
| } |
| -Response* TestService::BrokenMethod(MethodCall* method_call) { |
| - return NULL; |
| +void TestService::BrokenMethod(MethodCall* method_call, |
| + dbus::ExportedObject::ResponseSender response_sender) { |
|
satorux1
2011/11/22 23:55:39
ditto.
Vince Laviano
2011/11/23 00:04:24
Done.
|
| + response_sender.Run(NULL); |
| } |
| } // namespace dbus |