| 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 9979343c83b5e2f4acb9b3f49a446f0618c87c15..9ebc8e3e4ac71c8efc94968f016e7585f3b5bce3 100644
|
| --- a/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc
|
| +++ b/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc
|
| @@ -63,10 +63,12 @@ class MultiplexRouterTest : public testing::Test {
|
|
|
| TEST_F(MultiplexRouterTest, BasicRequestResponse) {
|
| InterfaceEndpointClient client0(std::move(endpoint0_), nullptr,
|
| - make_scoped_ptr(new PassThroughFilter()));
|
| + make_scoped_ptr(new PassThroughFilter()),
|
| + false);
|
| ResponseGenerator generator;
|
| InterfaceEndpointClient client1(std::move(endpoint1_), &generator,
|
| - make_scoped_ptr(new PassThroughFilter()));
|
| + make_scoped_ptr(new PassThroughFilter()),
|
| + false);
|
|
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
| @@ -108,10 +110,12 @@ TEST_F(MultiplexRouterTest, BasicRequestResponse) {
|
|
|
| TEST_F(MultiplexRouterTest, BasicRequestResponse_Synchronous) {
|
| InterfaceEndpointClient client0(std::move(endpoint0_), nullptr,
|
| - make_scoped_ptr(new PassThroughFilter()));
|
| + make_scoped_ptr(new PassThroughFilter()),
|
| + false);
|
| ResponseGenerator generator;
|
| InterfaceEndpointClient client1(std::move(endpoint1_), &generator,
|
| - make_scoped_ptr(new PassThroughFilter()));
|
| + make_scoped_ptr(new PassThroughFilter()),
|
| + false);
|
|
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
| @@ -150,9 +154,11 @@ TEST_F(MultiplexRouterTest, BasicRequestResponse_Synchronous) {
|
|
|
| TEST_F(MultiplexRouterTest, RequestWithNoReceiver) {
|
| InterfaceEndpointClient client0(std::move(endpoint0_), nullptr,
|
| - make_scoped_ptr(new PassThroughFilter()));
|
| + make_scoped_ptr(new PassThroughFilter()),
|
| + false);
|
| InterfaceEndpointClient client1(std::move(endpoint1_), nullptr,
|
| - make_scoped_ptr(new PassThroughFilter()));
|
| + make_scoped_ptr(new PassThroughFilter()),
|
| + false);
|
|
|
| // Without an incoming receiver set on client1, we expect client0 to observe
|
| // an error as a result of sending a message.
|
| @@ -179,11 +185,13 @@ TEST_F(MultiplexRouterTest, RequestWithNoReceiver) {
|
| // be sent until after the requests have been accepted.
|
| TEST_F(MultiplexRouterTest, LazyResponses) {
|
| InterfaceEndpointClient client0(std::move(endpoint0_), nullptr,
|
| - make_scoped_ptr(new PassThroughFilter()));
|
| + make_scoped_ptr(new PassThroughFilter()),
|
| + false);
|
| base::RunLoop run_loop;
|
| LazyResponseGenerator generator(run_loop.QuitClosure());
|
| InterfaceEndpointClient client1(std::move(endpoint1_), &generator,
|
| - make_scoped_ptr(new PassThroughFilter()));
|
| + make_scoped_ptr(new PassThroughFilter()),
|
| + false);
|
|
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
| @@ -243,7 +251,8 @@ TEST_F(MultiplexRouterTest, LazyResponses) {
|
| TEST_F(MultiplexRouterTest, MissingResponses) {
|
| base::RunLoop run_loop0, run_loop1;
|
| InterfaceEndpointClient client0(std::move(endpoint0_), nullptr,
|
| - make_scoped_ptr(new PassThroughFilter()));
|
| + make_scoped_ptr(new PassThroughFilter()),
|
| + false);
|
| bool error_handler_called0 = false;
|
| client0.set_connection_error_handler(
|
| [&error_handler_called0, &run_loop0]() {
|
| @@ -254,7 +263,8 @@ TEST_F(MultiplexRouterTest, MissingResponses) {
|
| base::RunLoop run_loop3;
|
| LazyResponseGenerator generator(run_loop3.QuitClosure());
|
| InterfaceEndpointClient client1(std::move(endpoint1_), &generator,
|
| - make_scoped_ptr(new PassThroughFilter()));
|
| + make_scoped_ptr(new PassThroughFilter()),
|
| + false);
|
| bool error_handler_called1 = false;
|
| client1.set_connection_error_handler(
|
| [&error_handler_called1, &run_loop1]() {
|
| @@ -302,9 +312,11 @@ TEST_F(MultiplexRouterTest, LateResponse) {
|
| LazyResponseGenerator generator(run_loop.QuitClosure());
|
| {
|
| InterfaceEndpointClient client0(std::move(endpoint0_), nullptr,
|
| - make_scoped_ptr(new PassThroughFilter()));
|
| + make_scoped_ptr(new PassThroughFilter()),
|
| + false);
|
| InterfaceEndpointClient client1(std::move(endpoint1_), &generator,
|
| - make_scoped_ptr(new PassThroughFilter()));
|
| + make_scoped_ptr(new PassThroughFilter()),
|
| + false);
|
|
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
|
|