diff options
Diffstat (limited to 'chromium/ipc/ipc_channel_mojo_unittest.cc')
| -rw-r--r-- | chromium/ipc/ipc_channel_mojo_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chromium/ipc/ipc_channel_mojo_unittest.cc b/chromium/ipc/ipc_channel_mojo_unittest.cc index 55ec898c075..806d1d32299 100644 --- a/chromium/ipc/ipc_channel_mojo_unittest.cc +++ b/chromium/ipc/ipc_channel_mojo_unittest.cc @@ -12,6 +12,7 @@ #include "base/base_paths.h" #include "base/bind.h" +#include "base/bind_helpers.h" #include "base/callback_helpers.h" #include "base/containers/queue.h" #include "base/files/file.h" @@ -49,11 +50,11 @@ #include "ipc/ipc_test.mojom.h" #include "ipc/ipc_test_base.h" #include "ipc/ipc_test_channel_listener.h" -#include "mojo/core/embedder/embedder.h" #include "mojo/public/cpp/bindings/associated_receiver.h" #include "mojo/public/cpp/bindings/associated_remote.h" #include "mojo/public/cpp/bindings/lib/validation_errors.h" #include "mojo/public/cpp/bindings/pending_associated_receiver.h" +#include "mojo/public/cpp/system/functions.h" #include "mojo/public/cpp/system/wait.h" #include "testing/gtest/include/gtest/gtest.h" @@ -348,7 +349,7 @@ TEST_F(IPCChannelMojoTest, NoImplicitChannelClosure) { // before Init() launches a child process. Hence the base::Optional here. base::Optional<base::RunLoop> wait_for_error_loop; bool process_error_received = false; - mojo::core::SetDefaultProcessErrorCallback( + mojo::SetDefaultProcessErrorHandler( base::BindLambdaForTesting([&](const std::string&) { process_error_received = true; wait_for_error_loop->Quit(); @@ -363,6 +364,7 @@ TEST_F(IPCChannelMojoTest, NoImplicitChannelClosure) { wait_for_error_loop->Run(); EXPECT_TRUE(process_error_received); + mojo::SetDefaultProcessErrorHandler(base::NullCallback()); // Tell the child it can quit and wait for it to shut down. ListenerThatExpectsOK::SendOK(channel()); |