| Index: mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc
|
| diff --git a/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc b/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc
|
| index 7f4bc4a21b3bb23c1a521eb3490aab92041bad76..8f972724c5dc37016a9b08886c05ad316e70422b 100644
|
| --- a/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc
|
| +++ b/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc
|
| @@ -75,11 +75,12 @@ TEST_F(MultiplexRouterTest, BasicRequestResponse) {
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
|
|
| + Error error;
|
| MessageQueue message_queue;
|
| base::RunLoop run_loop;
|
| client0.AcceptWithResponder(
|
| &request,
|
| - new MessageAccumulator(&message_queue, run_loop.QuitClosure()));
|
| + new MessageAccumulator(&message_queue, run_loop.QuitClosure()), &error);
|
|
|
| run_loop.Run();
|
|
|
| @@ -98,7 +99,7 @@ TEST_F(MultiplexRouterTest, BasicRequestResponse) {
|
| base::RunLoop run_loop2;
|
| client0.AcceptWithResponder(
|
| &request2,
|
| - new MessageAccumulator(&message_queue, run_loop2.QuitClosure()));
|
| + new MessageAccumulator(&message_queue, run_loop2.QuitClosure()), &error);
|
|
|
| run_loop2.Run();
|
|
|
| @@ -122,8 +123,10 @@ TEST_F(MultiplexRouterTest, BasicRequestResponse_Synchronous) {
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
|
|
| + Error error;
|
| MessageQueue message_queue;
|
| - client0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
|
| + client0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue),
|
| + &error);
|
|
|
| router1_->WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
|
| router0_->WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
|
| @@ -141,7 +144,7 @@ TEST_F(MultiplexRouterTest, BasicRequestResponse_Synchronous) {
|
| AllocRequestMessage(1, "hello again", &request2);
|
|
|
| client0.AcceptWithResponder(&request2,
|
| - new MessageAccumulator(&message_queue));
|
| + new MessageAccumulator(&message_queue), &error);
|
|
|
| router1_->WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
|
| router0_->WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
|
| @@ -168,12 +171,14 @@ TEST_F(MultiplexRouterTest, RequestWithNoReceiver) {
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
|
|
| + Error error;
|
| MessageQueue message_queue;
|
| base::RunLoop run_loop, run_loop2;
|
| client0.set_connection_error_handler(run_loop.QuitClosure());
|
| client1.set_connection_error_handler(run_loop2.QuitClosure());
|
| client0.AcceptWithResponder(
|
| - &request, new MessageAccumulator(&message_queue, run_loop.QuitClosure()));
|
| + &request, new MessageAccumulator(&message_queue, run_loop.QuitClosure()),
|
| + &error);
|
|
|
| run_loop.Run();
|
| run_loop2.Run();
|
| @@ -198,11 +203,12 @@ TEST_F(MultiplexRouterTest, LazyResponses) {
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
|
|
| + Error error;
|
| MessageQueue message_queue;
|
| base::RunLoop run_loop2;
|
| client0.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.
|
| @@ -229,7 +235,7 @@ TEST_F(MultiplexRouterTest, LazyResponses) {
|
| base::RunLoop run_loop4;
|
| client0.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.
|
| @@ -277,8 +283,10 @@ TEST_F(MultiplexRouterTest, MissingResponses) {
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
|
|
| + Error error;
|
| MessageQueue message_queue;
|
| - client0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
|
| + client0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue),
|
| + &error);
|
| run_loop3.Run();
|
|
|
| // The request has been received but no response has been sent.
|
| @@ -323,9 +331,10 @@ TEST_F(MultiplexRouterTest, LateResponse) {
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
|
|
| + Error error;
|
| MessageQueue message_queue;
|
| client0.AcceptWithResponder(&request,
|
| - new MessageAccumulator(&message_queue));
|
| + new MessageAccumulator(&message_queue), &error);
|
|
|
| run_loop.Run();
|
|
|
|
|