diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-01 12:59:39 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:40:43 +0000 |
| commit | 28b1110370900897ab652cb420c371fab8857ad4 (patch) | |
| tree | 41b32127d23b0df4f2add2a27e12dc87bddb260e /chromium/ipc/ipc_send_fds_test.cc | |
| parent | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (diff) | |
| download | qtwebengine-chromium-28b1110370900897ab652cb420c371fab8857ad4.tar.gz | |
BASELINE: Update Chromium to 53.0.2785.41
Also adds a few extra files for extensions.
Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/ipc/ipc_send_fds_test.cc')
| -rw-r--r-- | chromium/ipc/ipc_send_fds_test.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/chromium/ipc/ipc_send_fds_test.cc b/chromium/ipc/ipc_send_fds_test.cc index 9480d0e6232..a65601512d8 100644 --- a/chromium/ipc/ipc_send_fds_test.cc +++ b/chromium/ipc/ipc_send_fds_test.cc @@ -24,6 +24,7 @@ extern "C" { #include "base/location.h" #include "base/pickle.h" #include "base/posix/eintr_wrapper.h" +#include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/waitable_event.h" #include "ipc/ipc_message_attachment_set.h" @@ -133,7 +134,7 @@ class IPCSendFdsTest : public IPCTestBase { } // Run message loop. - base::MessageLoop::current()->Run(); + base::RunLoop().Run(); // Close the channel so the client's OnChannelError() gets fired. channel()->Close(); @@ -159,7 +160,7 @@ int SendFdsClientCommon(const std::string& test_client_name, CHECK(channel->Connect()); // Run message loop. - base::MessageLoop::current()->Run(); + base::RunLoop().Run(); // Verify that the message loop was exited due to getting the correct number // of descriptors, and not because of the channel closing unexpectedly. @@ -269,8 +270,10 @@ class PipeChannelHelper { } ~PipeChannelHelper() { - base::WaitableEvent a(true, false); - base::WaitableEvent b(true, false); + base::WaitableEvent a(base::WaitableEvent::ResetPolicy::MANUAL, + base::WaitableEvent::InitialState::NOT_SIGNALED); + base::WaitableEvent b(base::WaitableEvent::ResetPolicy::MANUAL, + base::WaitableEvent::InitialState::NOT_SIGNALED); in_thread_->task_runner()->PostTask( FROM_HERE, base::Bind(&PipeChannelHelper::DestroyChannel, &in, &a)); out_thread_->task_runner()->PostTask( @@ -315,7 +318,9 @@ class PipeChannelHelper { // http://crbug.com/298276 class IPCMultiSendingFdsTest : public testing::Test { public: - IPCMultiSendingFdsTest() : received_(true, false) {} + IPCMultiSendingFdsTest() + : received_(base::WaitableEvent::ResetPolicy::MANUAL, + base::WaitableEvent::InitialState::NOT_SIGNALED) {} void Producer(PipeChannelHelper* dest, base::Thread* t, |