commit 7bf30965ec4d78481355a0e9bfedb368e135f5c9
author Gyuyoung Kim <gyuyoung@igalia.com> Thu Feb 21 11:43:47 2019
committer Commit Bot <commit-bot@chromium.org> Thu Feb 21 11:43:47 2019
tree 75997c418f9106a7754066731ccb0bda323f9bb7
parent 3d2fcc695141f9f6976ee7b230369025f25df43d

OnionSoup: Remove all uses of Blink's WaitableEvent in PushPullFIFOSmokeTest

This CL removes all uses of Blink's WaitableEvent in push_pull_fifo_multithread_test.cc.
All uses of it are replaced with base::WaitableEvent.

In the WaitMultiple() function replacement case, base::WaitableEvent doesn't have the
method. So, this CL makes PushPullFIFOSmokeTest.SmokeTests call
base::WaitableEvent::WaitMany() directly.

Bug: 919388
Change-Id: Iae2190eab633b985bf0aad72259e3ad4393d0f43
Reviewed-on: https://chromium-review.googlesource.com/c/1480365
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#634151}

third_party/blink/renderer/platform/audio/push_pull_fifo_multithread_test.cc

diff --git a/third_party/blink/renderer/platform/audio/push_pull_fifo_multithread_test.cc b/third_party/blink/renderer/platform/audio/push_pull_fifo_multithread_test.cc
index b9f63c1d..6acec5a 100644
--- a/third_party/blink/renderer/platform/audio/push_pull_fifo_multithread_test.cc
+++ b/third_party/blink/renderer/platform/audio/push_pull_fifo_multithread_test.cc
@@ -5,6 +5,7 @@
 #include "third_party/blink/renderer/platform/audio/push_pull_fifo.h"
 
 #include <memory>
+#include "base/synchronization/waitable_event.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/renderer/platform/audio/audio_utilities.h"
@@ -14,7 +15,6 @@
 #include "third_party/blink/renderer/platform/testing/testing_platform_support.h"
 #include "third_party/blink/renderer/platform/testing/testing_platform_support_with_mock_scheduler.h"
 #include "third_party/blink/renderer/platform/testing/unit_test_helpers.h"
-#include "third_party/blink/renderer/platform/waitable_event.h"
 #include "third_party/blink/renderer/platform/wtf/functional.h"
 
 namespace blink {
@@ -31,10 +31,12 @@
         client_thread_(Platform::Current()->CreateThread(
             ThreadCreationParams(WebThreadType::kTestThread)
                 .SetThreadNameForTest("FIFOClientThread"))),
-        done_event_(std::make_unique<WaitableEvent>()),
+        done_event_(std::make_unique<base::WaitableEvent>(
+            base::WaitableEvent::ResetPolicy::AUTOMATIC,
+            base::WaitableEvent::InitialState::NOT_SIGNALED)),
         jitter_range_ms_(jitter_range_ms) {}
 
-  WaitableEvent* Start(double duration_ms, double interval_ms) {
+  base::WaitableEvent* Start(double duration_ms, double interval_ms) {
     duration_ms_ = duration_ms;
     interval_ms_ = interval_ms;
     PostCrossThreadTask(*client_thread_->GetTaskRunner(), FROM_HERE,
@@ -77,7 +79,7 @@
   PushPullFIFO* fifo_;
   scoped_refptr<AudioBus> bus_;
   std::unique_ptr<Thread> client_thread_;
-  std::unique_ptr<WaitableEvent> done_event_;
+  std::unique_ptr<base::WaitableEvent> done_event_;
 
   // Test duration.
   double duration_ms_;
@@ -167,7 +169,7 @@
   std::unique_ptr<PushClient> push_client = std::make_unique<PushClient>(
       test_fifo.get(), param.push_buffer_size, param.push_jitter_range_ms);
 
-  Vector<WaitableEvent*> done_events;
+  std::vector<base::WaitableEvent*> done_events;
   done_events.push_back(
       pull_client->Start(param.test_duration_ms, pull_interval_ms));
   done_events.push_back(
@@ -176,8 +178,8 @@
   LOG(INFO) << "PushPullFIFOSmokeTest - Started";
 
   // We have to wait both of events to be signaled.
-  WaitableEvent::WaitMultiple(done_events);
-  WaitableEvent::WaitMultiple(done_events);
+  base::WaitableEvent::WaitMany(done_events.data(), done_events.size());
+  base::WaitableEvent::WaitMany(done_events.data(), done_events.size());
 }
 
 FIFOSmokeTestParam smoke_test_params[] = {