| 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 9bfcf2ceb690654d06d5611bb038369a90261de9..a72fa1807f719894791c7caeeb9455138bad2a1c 100644
|
| --- a/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc
|
| +++ b/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc
|
| @@ -65,12 +65,12 @@ class MultiplexRouterTest : public testing::Test {
|
|
|
| TEST_F(MultiplexRouterTest, BasicRequestResponse) {
|
| InterfaceEndpointClient client0(std::move(endpoint0_), nullptr,
|
| - base::WrapUnique(new PassThroughFilter()),
|
| - false, base::ThreadTaskRunnerHandle::Get());
|
| + base::MakeUnique<PassThroughFilter>(), false,
|
| + base::ThreadTaskRunnerHandle::Get());
|
| ResponseGenerator generator;
|
| InterfaceEndpointClient client1(std::move(endpoint1_), &generator,
|
| - base::WrapUnique(new PassThroughFilter()),
|
| - false, base::ThreadTaskRunnerHandle::Get());
|
| + base::MakeUnique<PassThroughFilter>(), false,
|
| + base::ThreadTaskRunnerHandle::Get());
|
|
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
| @@ -112,12 +112,12 @@ TEST_F(MultiplexRouterTest, BasicRequestResponse) {
|
|
|
| TEST_F(MultiplexRouterTest, BasicRequestResponse_Synchronous) {
|
| InterfaceEndpointClient client0(std::move(endpoint0_), nullptr,
|
| - base::WrapUnique(new PassThroughFilter()),
|
| - false, base::ThreadTaskRunnerHandle::Get());
|
| + base::MakeUnique<PassThroughFilter>(), false,
|
| + base::ThreadTaskRunnerHandle::Get());
|
| ResponseGenerator generator;
|
| InterfaceEndpointClient client1(std::move(endpoint1_), &generator,
|
| - base::WrapUnique(new PassThroughFilter()),
|
| - false, base::ThreadTaskRunnerHandle::Get());
|
| + base::MakeUnique<PassThroughFilter>(), false,
|
| + base::ThreadTaskRunnerHandle::Get());
|
|
|
| Message request;
|
| AllocRequestMessage(1, "hello", &request);
|
| @@ -156,11 +156,11 @@ TEST_F(MultiplexRouterTest, BasicRequestResponse_Synchronous) {
|
|
|
| TEST_F(MultiplexRouterTest, RequestWithNoReceiver) {
|
| InterfaceEndpointClient client0(std::move(endpoint0_), nullptr,
|
| - base::WrapUnique(new PassThroughFilter()),
|
| - false, base::ThreadTaskRunnerHandle::Get());
|
| + base::MakeUnique<PassThroughFilter>(), false,
|
| + base::ThreadTaskRunnerHandle::Get());
|
| InterfaceEndpointClient client1(std::move(endpoint1_), nullptr,
|
| - base::WrapUnique(new PassThroughFilter()),
|
| - false, base::ThreadTaskRunnerHandle::Get());
|
| + base::MakeUnique<PassThroughFilter>(), false,
|
| + base::ThreadTaskRunnerHandle::Get());
|
|
|
| // Without an incoming receiver set on client1, we expect client0 to observe
|
| // an error as a result of sending a message.
|
| @@ -315,10 +315,10 @@ TEST_F(MultiplexRouterTest, LateResponse) {
|
| LazyResponseGenerator generator(run_loop.QuitClosure());
|
| {
|
| InterfaceEndpointClient client0(std::move(endpoint0_), nullptr,
|
| - base::WrapUnique(new PassThroughFilter()),
|
| + base::MakeUnique<PassThroughFilter>(),
|
| false, base::ThreadTaskRunnerHandle::Get());
|
| InterfaceEndpointClient client1(std::move(endpoint1_), &generator,
|
| - base::WrapUnique(new PassThroughFilter()),
|
| + base::MakeUnique<PassThroughFilter>(),
|
| false, base::ThreadTaskRunnerHandle::Get());
|
|
|
| Message request;
|
|
|