| Index: mojo/public/cpp/bindings/tests/router_unittest.cc
|
| diff --git a/mojo/public/cpp/bindings/tests/router_unittest.cc b/mojo/public/cpp/bindings/tests/router_unittest.cc
|
| index 0c7ab86b58f4169919b10619078c730cc707f0f0..9b9b1eaf0a13e649097fea8e9c8d32e0717c7d60 100644
|
| --- a/mojo/public/cpp/bindings/tests/router_unittest.cc
|
| +++ b/mojo/public/cpp/bindings/tests/router_unittest.cc
|
| @@ -49,10 +49,12 @@ TEST_F(RouterTest, BasicRequestResponse) {
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
|
|
| + Error error;
|
| MessageQueue message_queue;
|
| base::RunLoop run_loop;
|
| router0.AcceptWithResponder(
|
| - &request, new MessageAccumulator(&message_queue, run_loop.QuitClosure()));
|
| + &request, new MessageAccumulator(&message_queue, run_loop.QuitClosure()),
|
| + &error);
|
|
|
| run_loop.Run();
|
|
|
| @@ -71,7 +73,8 @@ TEST_F(RouterTest, BasicRequestResponse) {
|
| base::RunLoop run_loop2;
|
| router0.AcceptWithResponder(
|
| &request2,
|
| - new MessageAccumulator(&message_queue, run_loop2.QuitClosure()));
|
| + new MessageAccumulator(&message_queue, run_loop2.QuitClosure()),
|
| + &error);
|
|
|
| run_loop2.Run();
|
|
|
| @@ -95,8 +98,10 @@ TEST_F(RouterTest, BasicRequestResponse_Synchronous) {
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
|
|
| + Error error;
|
| MessageQueue message_queue;
|
| - router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
|
| + router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue),
|
| + &error);
|
|
|
| router1.WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
|
| router0.WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
|
| @@ -114,7 +119,7 @@ TEST_F(RouterTest, BasicRequestResponse_Synchronous) {
|
| AllocRequestMessage(1, "hello again", &request2);
|
|
|
| router0.AcceptWithResponder(&request2,
|
| - new MessageAccumulator(&message_queue));
|
| + new MessageAccumulator(&message_queue), &error);
|
|
|
| router1.WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
|
| router0.WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
|
| @@ -139,11 +144,13 @@ TEST_F(RouterTest, RequestWithNoReceiver) {
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
|
|
| + Error error;
|
| MessageQueue message_queue;
|
| base::RunLoop run_loop, run_loop2;
|
| router0.set_connection_error_handler(run_loop.QuitClosure());
|
| router1.set_connection_error_handler(run_loop2.QuitClosure());
|
| - router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
|
| + router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue),
|
| + &error);
|
|
|
| run_loop.Run();
|
| run_loop2.Run();
|
| @@ -168,11 +175,12 @@ TEST_F(RouterTest, LazyResponses) {
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
|
|
| + Error error;
|
| MessageQueue message_queue;
|
| base::RunLoop run_loop2;
|
| router0.AcceptWithResponder(
|
| &request,
|
| - new MessageAccumulator(&message_queue, run_loop2.QuitClosure()));
|
| + new MessageAccumulator(&message_queue, run_loop2.QuitClosure()), &error);
|
| run_loop.Run();
|
|
|
| // The request has been received but the response has not been sent yet.
|
| @@ -201,7 +209,7 @@ TEST_F(RouterTest, LazyResponses) {
|
| base::RunLoop run_loop4;
|
| router0.AcceptWithResponder(
|
| &request2,
|
| - new MessageAccumulator(&message_queue, run_loop4.QuitClosure()));
|
| + new MessageAccumulator(&message_queue, run_loop4.QuitClosure()), &error);
|
| run_loop3.Run();
|
|
|
| // The request has been received but the response has not been sent yet.
|
| @@ -250,8 +258,10 @@ TEST_F(RouterTest, MissingResponses) {
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
|
|
| + Error error;
|
| MessageQueue message_queue;
|
| - router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
|
| + router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue),
|
| + &error);
|
| run_loop3.Run();
|
|
|
| // The request has been received but no response has been sent.
|
| @@ -296,9 +306,11 @@ TEST_F(RouterTest, LateResponse) {
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
|
|
| + Error error;
|
| MessageQueue message_queue;
|
| router0.AcceptWithResponder(&request,
|
| - new MessageAccumulator(&message_queue));
|
| + new MessageAccumulator(&message_queue),
|
| + &error);
|
|
|
| run_loop.Run();
|
|
|
|
|