Commit 0366bc98 authored by Gabriel Charette's avatar Gabriel Charette Committed by Commit Bot

Backport some tests in /media/audio to SingleThreadTaskEnvironment

These tests were previously migrated from single-threaded MessageLoop to
a multi-threaded TaskEnvironment (then named ScopedTaskEnvironment) as
part of crbug.com/891670.

//base OWNERS decided in retrospect that it was better to keep a
single-threaded option for TaskEnvironment and introduced
SingleThreadTaskEnvironment. This CL retrofits that decision for
/media/audio.

This CL is a no-op if it passes CQ.

This CL was uploaded by git cl split.

R=tommi@chromium.org

Bug: 891670
Change-Id: I9bff22af41a71e1fd0483d76412748a38433da6b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1787199
Auto-Submit: Gabriel Charette <gab@chromium.org>
Reviewed-by: default avatarTommi <tommi@chromium.org>
Commit-Queue: Tommi <tommi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693603}
parent 83dc6e28
...@@ -144,7 +144,7 @@ class AudioInputControllerTest : public testing::TestWithParam<bool> { ...@@ -144,7 +144,7 @@ class AudioInputControllerTest : public testing::TestWithParam<bool> {
run_loop.Run(); run_loop.Run();
} }
base::test::TaskEnvironment task_environment_; base::test::SingleThreadTaskEnvironment task_environment_;
// Parameterize tests to run AudioInputController either on audio thread // Parameterize tests to run AudioInputController either on audio thread
// (synchronously), or on a different thread (non-blocking). // (synchronously), or on a different thread (non-blocking).
......
...@@ -488,7 +488,7 @@ class AudioOutputProxyTest : public testing::Test { ...@@ -488,7 +488,7 @@ class AudioOutputProxyTest : public testing::Test {
proxy->Close(); proxy->Close();
} }
base::test::TaskEnvironment task_environment_; base::test::SingleThreadTaskEnvironment task_environment_;
MockAudioManager manager_; MockAudioManager manager_;
std::unique_ptr<AudioOutputDispatcherImpl> dispatcher_impl_; std::unique_ptr<AudioOutputDispatcherImpl> dispatcher_impl_;
MockAudioSourceCallback callback_; MockAudioSourceCallback callback_;
......
...@@ -36,7 +36,7 @@ class AudioSystemImplTestBase : public testing::Test { ...@@ -36,7 +36,7 @@ class AudioSystemImplTestBase : public testing::Test {
MockAudioManager* audio_manager() { return audio_manager_.get(); } MockAudioManager* audio_manager() { return audio_manager_.get(); }
AudioSystem* audio_system() { return audio_system_.get(); } AudioSystem* audio_system() { return audio_system_.get(); }
base::test::TaskEnvironment task_environment_; base::test::SingleThreadTaskEnvironment task_environment_;
std::unique_ptr<MockAudioManager> audio_manager_; std::unique_ptr<MockAudioManager> audio_manager_;
std::unique_ptr<AudioSystem> audio_system_; std::unique_ptr<AudioSystem> audio_system_;
// AudioSystemTester tester_; // AudioSystemTester tester_;
......
...@@ -98,7 +98,7 @@ class AudioDeviceListenerMacTest : public testing::Test { ...@@ -98,7 +98,7 @@ class AudioDeviceListenerMacTest : public testing::Test {
MOCK_METHOD0(OnDeviceChange, void()); MOCK_METHOD0(OnDeviceChange, void());
protected: protected:
base::test::TaskEnvironment task_environment_; base::test::SingleThreadTaskEnvironment task_environment_;
std::unique_ptr<AudioDeviceListenerMac> device_listener_; std::unique_ptr<AudioDeviceListenerMac> device_listener_;
DISALLOW_COPY_AND_ASSIGN(AudioDeviceListenerMacTest); DISALLOW_COPY_AND_ASSIGN(AudioDeviceListenerMacTest);
......
...@@ -113,7 +113,8 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback { ...@@ -113,7 +113,8 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback {
class MacAudioInputTest : public testing::Test { class MacAudioInputTest : public testing::Test {
protected: protected:
MacAudioInputTest() MacAudioInputTest()
: task_environment_(base::test::TaskEnvironment::MainThreadType::UI), : task_environment_(
base::test::SingleThreadTaskEnvironment::MainThreadType::UI),
audio_manager_(AudioManager::CreateForTesting( audio_manager_(AudioManager::CreateForTesting(
std::make_unique<TestAudioThread>())) { std::make_unique<TestAudioThread>())) {
// Wait for the AudioManager to finish any initialization on the audio loop. // Wait for the AudioManager to finish any initialization on the audio loop.
...@@ -158,7 +159,7 @@ class MacAudioInputTest : public testing::Test { ...@@ -158,7 +159,7 @@ class MacAudioInputTest : public testing::Test {
void OnLogMessage(const std::string& message) { log_message_ = message; } void OnLogMessage(const std::string& message) { log_message_ = message; }
base::test::TaskEnvironment task_environment_; base::test::SingleThreadTaskEnvironment task_environment_;
std::unique_ptr<AudioManager> audio_manager_; std::unique_ptr<AudioManager> audio_manager_;
std::string log_message_; std::string log_message_;
}; };
......
...@@ -268,7 +268,7 @@ class WinAudioInputTest : public ::testing::Test { ...@@ -268,7 +268,7 @@ class WinAudioInputTest : public ::testing::Test {
~WinAudioInputTest() override { audio_manager_->Shutdown(); } ~WinAudioInputTest() override { audio_manager_->Shutdown(); }
protected: protected:
base::test::TaskEnvironment task_environment_; base::test::SingleThreadTaskEnvironment task_environment_;
std::unique_ptr<AudioManager> audio_manager_; std::unique_ptr<AudioManager> audio_manager_;
}; };
......
...@@ -164,7 +164,7 @@ class WinAudioTest : public ::testing::Test { ...@@ -164,7 +164,7 @@ class WinAudioTest : public ::testing::Test {
~WinAudioTest() override { audio_manager_->Shutdown(); } ~WinAudioTest() override { audio_manager_->Shutdown(); }
protected: protected:
base::test::TaskEnvironment task_environment_; base::test::SingleThreadTaskEnvironment task_environment_;
std::unique_ptr<AudioManager> audio_manager_; std::unique_ptr<AudioManager> audio_manager_;
std::unique_ptr<AudioDeviceInfoAccessorForTests> audio_manager_device_info_; std::unique_ptr<AudioDeviceInfoAccessorForTests> audio_manager_device_info_;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment