| Index: media/audio/virtual_audio_input_stream_unittest.cc
|
| diff --git a/media/audio/virtual_audio_input_stream_unittest.cc b/media/audio/virtual_audio_input_stream_unittest.cc
|
| index d042555126c5aa490a6e9d60825d609272ae402e..8baa74cf33363d8f887cb1d11b4581015c044b12 100644
|
| --- a/media/audio/virtual_audio_input_stream_unittest.cc
|
| +++ b/media/audio/virtual_audio_input_stream_unittest.cc
|
| @@ -35,7 +35,8 @@ const AudioParameters kParams(
|
| class MockInputCallback : public AudioInputStream::AudioInputCallback {
|
| public:
|
| MockInputCallback()
|
| - : data_pushed_(false, false) {
|
| + : data_pushed_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
|
| + base::WaitableEvent::InitialState::NOT_SIGNALED) {
|
| ON_CALL(*this, OnData(_, _, _, _)).WillByDefault(
|
| InvokeWithoutArgs(&data_pushed_, &base::WaitableEvent::Signal));
|
| }
|
| @@ -64,9 +65,11 @@ class MockInputCallback : public AudioInputStream::AudioInputCallback {
|
| class TestAudioSource : public SineWaveAudioSource {
|
| public:
|
| TestAudioSource()
|
| - : SineWaveAudioSource(
|
| - kParams.channel_layout(), 200.0, kParams.sample_rate()),
|
| - data_pulled_(false, false) {}
|
| + : SineWaveAudioSource(kParams.channel_layout(),
|
| + 200.0,
|
| + kParams.sample_rate()),
|
| + data_pulled_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
|
| + base::WaitableEvent::InitialState::NOT_SIGNALED) {}
|
|
|
| ~TestAudioSource() override {}
|
|
|
| @@ -99,7 +102,8 @@ class VirtualAudioInputStreamTest : public testing::TestWithParam<bool> {
|
| : audio_thread_(new base::Thread("AudioThread")),
|
| worker_thread_(new base::Thread("AudioWorkerThread")),
|
| stream_(NULL),
|
| - closed_stream_(false, false) {
|
| + closed_stream_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
|
| + base::WaitableEvent::InitialState::NOT_SIGNALED) {
|
| audio_thread_->Start();
|
| audio_task_runner_ = audio_thread_->task_runner();
|
| }
|
| @@ -222,7 +226,8 @@ class VirtualAudioInputStreamTest : public testing::TestWithParam<bool> {
|
|
|
| private:
|
| void SyncWithAudioThread() {
|
| - base::WaitableEvent done(false, false);
|
| + base::WaitableEvent done(base::WaitableEvent::ResetPolicy::AUTOMATIC,
|
| + base::WaitableEvent::InitialState::NOT_SIGNALED);
|
| audio_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
|
|
|