Use ScopedTaskEnvironment instead of MessageLoop
MessageLoop will go away, eventually.
ScopedTaskEnvironment will per default start a ThreadPool, which should
be fine in most of the cases. If you belive your test needs to make sure
that no ThreadPool runs let me know and I will update the patch.
BUG=891670
This CL was uploaded by git cl split.
R=chcunningham@chromium.org
Change-Id: I78fc74ba3ed1e3441c130d8426c557b18a470fb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1635619
Commit-Queue: Chrome Cunningham <chcunningham@chromium.org>
Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>
Auto-Submit: Carlos Caballero <carlscab@google.com>
Cr-Commit-Position: refs/heads/master@{#665277}
diff --git a/media/base/android/media_player_bridge_unittest.cc b/media/base/android/media_player_bridge_unittest.cc
index 54bbd5c..a34bfa8 100644
--- a/media/base/android/media_player_bridge_unittest.cc
+++ b/media/base/android/media_player_bridge_unittest.cc
@@ -5,7 +5,7 @@
#include "media/base/android/media_player_bridge.h"
#include "base/bind.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -46,9 +46,7 @@
void SimulatePlaybackCompleted() { bridge_.OnPlaybackComplete(); }
- // A message loop needs to be instantiated in order for the test to run
- // properly.
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
StrictMock<MockMediaPlayerBridgeClient> client_;
MediaPlayerBridge bridge_;
diff --git a/media/base/android/media_service_throttler_unittest.cc b/media/base/android/media_service_throttler_unittest.cc
index e86e7739..5b6f5f9 100644
--- a/media/base/android/media_service_throttler_unittest.cc
+++ b/media/base/android/media_service_throttler_unittest.cc
@@ -4,7 +4,7 @@
#include "media/base/android/media_service_throttler.h"
-#include "base/message_loop/message_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "base/test/simple_test_tick_clock.h"
#include "media/base/android/media_server_crash_listener.h"
#include "media/base/fake_single_thread_task_runner.h"
@@ -60,7 +60,7 @@
scoped_refptr<FakeSingleThreadTaskRunner> test_task_runner_;
// Necessary, or else base::ThreadTaskRunnerHandle::Get() fails.
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
private:
DISALLOW_COPY_AND_ASSIGN(MediaServiceThrottlerTest);
diff --git a/media/base/bind_to_current_loop_unittest.cc b/media/base/bind_to_current_loop_unittest.cc
index effa8b6..1a750bb 100644
--- a/media/base/bind_to_current_loop_unittest.cc
+++ b/media/base/bind_to_current_loop_unittest.cc
@@ -9,9 +9,9 @@
#include "base/bind.h"
#include "base/memory/free_deleter.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/synchronization/waitable_event.h"
+#include "base/test/scoped_task_environment.h"
#include "base/threading/thread.h"
#include "base/threading/thread_checker_impl.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -61,7 +61,7 @@
// on the message loop, not during the original Run.
class BindToCurrentLoopTest : public ::testing::Test {
protected:
- base::MessageLoop loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
};
TEST_F(BindToCurrentLoopTest, RepeatingClosure) {
diff --git a/media/base/fake_demuxer_stream_unittest.cc b/media/base/fake_demuxer_stream_unittest.cc
index 16c1da0..b9a077a 100644
--- a/media/base/fake_demuxer_stream_unittest.cc
+++ b/media/base/fake_demuxer_stream_unittest.cc
@@ -8,8 +8,8 @@
#include "base/bind.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "media/base/decoder_buffer.h"
#include "media/base/demuxer_stream.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -180,7 +180,7 @@
ReadAllBuffers(num_configs, num_buffers_in_one_config);
}
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
std::unique_ptr<FakeDemuxerStream> stream_;
DemuxerStream::Status status_;
diff --git a/media/base/null_video_sink_unittest.cc b/media/base/null_video_sink_unittest.cc
index 5909ec9b..4b81e14 100644
--- a/media/base/null_video_sink_unittest.cc
+++ b/media/base/null_video_sink_unittest.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "base/test/simple_test_tick_clock.h"
#include "components/viz/common/frame_sinks/begin_frame_args.h"
#include "media/base/gmock_callback_support.h"
@@ -36,7 +36,7 @@
std::unique_ptr<NullVideoSink> new_sink(new NullVideoSink(
clockless, interval,
base::Bind(&NullVideoSinkTest::FrameReceived, base::Unretained(this)),
- message_loop_.task_runner()));
+ scoped_task_environment_.GetMainThreadTaskRunner()));
new_sink->set_tick_clock_for_testing(&tick_clock_);
return new_sink;
}
@@ -61,7 +61,7 @@
MOCK_METHOD1(FrameReceived, void(scoped_refptr<VideoFrame>));
protected:
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
base::SimpleTestTickClock tick_clock_;
DISALLOW_COPY_AND_ASSIGN(NullVideoSinkTest);
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index 426bf90..3c48a46 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -12,10 +12,10 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
+#include "base/test/scoped_task_environment.h"
#include "base/test/simple_test_tick_clock.h"
#include "base/threading/simple_thread.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -101,9 +101,10 @@
};
PipelineImplTest()
- : pipeline_(new PipelineImpl(message_loop_.task_runner(),
- message_loop_.task_runner(),
- &media_log_)),
+ : pipeline_(
+ new PipelineImpl(scoped_task_environment_.GetMainThreadTaskRunner(),
+ scoped_task_environment_.GetMainThreadTaskRunner(),
+ &media_log_)),
demuxer_(new StrictMock<MockDemuxer>()),
demuxer_host_(nullptr),
scoped_renderer_(new StrictMock<MockRenderer>()),
@@ -321,7 +322,7 @@
// Fixture members.
StrictMock<CallbackHelper> callbacks_;
base::SimpleTestTickClock test_tick_clock_;
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
NullMediaLog media_log_;
std::unique_ptr<PipelineImpl> pipeline_;
@@ -714,21 +715,22 @@
// Invoked function OnError. This asserts that the pipeline does not enqueue
// non-teardown related tasks while tearing down.
-static void TestNoCallsAfterError(PipelineImpl* pipeline,
- base::MessageLoop* message_loop,
- PipelineStatus /* status */) {
+static void TestNoCallsAfterError(
+ PipelineImpl* pipeline,
+ base::test::ScopedTaskEnvironment* task_environment,
+ PipelineStatus /* status */) {
CHECK(pipeline);
- CHECK(message_loop);
+ CHECK(task_environment);
- // When we get to this stage, the message loop should be empty.
- EXPECT_TRUE(message_loop->IsIdleForTesting());
+ // When we get to this stage, there should be no pending tasks.
+ EXPECT_EQ(0u, task_environment->GetPendingMainThreadTaskCount());
// Make calls on pipeline after error has occurred.
pipeline->SetPlaybackRate(0.5);
pipeline->SetVolume(0.5f);
// No additional tasks should be queued as a result of these calls.
- EXPECT_TRUE(message_loop->IsIdleForTesting());
+ EXPECT_EQ(0u, task_environment->GetPendingMainThreadTaskCount());
}
TEST_F(PipelineImplTest, NoMessageDuringTearDownFromError) {
@@ -741,8 +743,8 @@
StartPipelineAndExpect(PIPELINE_OK);
// Trigger additional requests on the pipeline during tear down from error.
- base::Callback<void(PipelineStatus)> cb =
- base::Bind(&TestNoCallsAfterError, pipeline_.get(), &message_loop_);
+ base::Callback<void(PipelineStatus)> cb = base::Bind(
+ &TestNoCallsAfterError, pipeline_.get(), &scoped_task_environment_);
ON_CALL(callbacks_, OnError(_)).WillByDefault(Invoke(CreateFunctor(cb)));
base::TimeDelta seek_time = base::TimeDelta::FromSeconds(5);
diff --git a/media/base/serial_runner_unittest.cc b/media/base/serial_runner_unittest.cc
index 39e439d..354f8f8 100644
--- a/media/base/serial_runner_unittest.cc
+++ b/media/base/serial_runner_unittest.cc
@@ -8,9 +8,9 @@
#include "base/bind.h"
#include "base/debug/stack_trace.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
+#include "base/test/scoped_task_environment.h"
#include "media/base/pipeline_status.h"
#include "media/base/serial_runner.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -24,7 +24,7 @@
~SerialRunnerTest() override = default;
void RunSerialRunner() {
- message_loop_.task_runner()->PostTask(
+ scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE, base::BindOnce(&SerialRunnerTest::StartRunnerInternal,
base::Unretained(this), bound_fns_));
base::RunLoop().RunUntilIdle();
@@ -119,7 +119,7 @@
void CancelSerialRunner(const PipelineStatusCB& status_cb) {
// Tasks run by |runner_| shouldn't reset it, hence we post a task to do so.
- message_loop_.task_runner()->PostTask(
+ scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE, base::BindOnce(&SerialRunnerTest::ResetSerialRunner,
base::Unretained(this)));
status_cb.Run(PIPELINE_OK);
@@ -129,7 +129,7 @@
runner_.reset();
}
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
SerialRunner::Queue bound_fns_;
std::unique_ptr<SerialRunner> runner_;
diff --git a/media/base/text_renderer_unittest.cc b/media/base/text_renderer_unittest.cc
index be327b6..dd0df32 100644
--- a/media/base/text_renderer_unittest.cc
+++ b/media/base/text_renderer_unittest.cc
@@ -12,8 +12,8 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/decoder_buffer.h"
#include "media/base/demuxer_stream.h"
@@ -55,7 +55,7 @@
DCHECK(!text_renderer_);
text_renderer_.reset(new TextRenderer(
- message_loop_.task_runner(),
+ scoped_task_environment_.GetMainThreadTaskRunner(),
base::Bind(&TextRendererTest::OnAddTextTrack, base::Unretained(this))));
text_renderer_->Initialize(
base::Bind(&TextRendererTest::OnEnd, base::Unretained(this)));
@@ -190,7 +190,7 @@
MOCK_METHOD0(OnPause, void());
MOCK_METHOD0(OnFlush, void());
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
typedef std::vector<std::unique_ptr<FakeTextTrackStream>> TextTrackStreams;
TextTrackStreams text_track_streams_;
@@ -206,7 +206,7 @@
TEST_F(TextRendererTest, CreateTextRendererNoInit) {
text_renderer_.reset(new TextRenderer(
- message_loop_.task_runner(),
+ scoped_task_environment_.GetMainThreadTaskRunner(),
base::Bind(&TextRendererTest::OnAddTextTrack, base::Unretained(this))));
text_renderer_.reset();
}
diff --git a/media/device_monitors/system_message_window_win_unittest.cc b/media/device_monitors/system_message_window_win_unittest.cc
index 59863df..a9eee37 100644
--- a/media/device_monitors/system_message_window_win_unittest.cc
+++ b/media/device_monitors/system_message_window_win_unittest.cc
@@ -5,14 +5,15 @@
#include "media/device_monitors/system_message_window_win.h"
#include <dbt.h>
+
#include <string>
#include <vector>
#include "base/files/file_path.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/system/system_monitor.h"
#include "base/test/mock_devices_changed_observer.h"
+#include "base/test/scoped_task_environment.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -27,7 +28,9 @@
system_monitor_.AddDevicesChangedObserver(&observer_);
}
- base::MessageLoop message_loop_;
+ // Run single threaded to not require explicit COM initialization
+ base::test::ScopedTaskEnvironment scoped_task_environment_{
+ base::test::ScopedTaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY};
base::SystemMonitor system_monitor_;
base::MockDevicesChangedObserver observer_;
SystemMessageWindowWin window_;
diff --git a/media/filters/aom_video_decoder_unittest.cc b/media/filters/aom_video_decoder_unittest.cc
index 596b761..27498ac 100644
--- a/media/filters/aom_video_decoder_unittest.cc
+++ b/media/filters/aom_video_decoder_unittest.cc
@@ -7,8 +7,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "build/build_config.h"
#include "media/base/decoder_buffer.h"
#include "media/base/limits.h"
@@ -164,7 +164,7 @@
testing::StrictMock<MockMediaLog> media_log_;
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
std::unique_ptr<AomVideoDecoder> decoder_;
scoped_refptr<DecoderBuffer> i_frame_buffer_;
diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc
index 8ac201a..b5435e7 100644
--- a/media/filters/audio_decoder_unittest.cc
+++ b/media/filters/audio_decoder_unittest.cc
@@ -13,10 +13,10 @@
#include "base/format_macros.h"
#include "base/hash/md5.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "base/sys_byteorder.h"
+#include "base/test/scoped_task_environment.h"
#include "base/threading/platform_thread.h"
#include "build/build_config.h"
#include "media/base/audio_buffer.h"
@@ -133,12 +133,13 @@
last_decode_status_(DecodeStatus::DECODE_ERROR) {
switch (decoder_type_) {
case FFMPEG:
- decoder_.reset(
- new FFmpegAudioDecoder(message_loop_.task_runner(), &media_log_));
+ decoder_.reset(new FFmpegAudioDecoder(
+ scoped_task_environment_.GetMainThreadTaskRunner(), &media_log_));
break;
#if defined(OS_ANDROID)
case MEDIA_CODEC:
- decoder_.reset(new MediaCodecAudioDecoder(message_loop_.task_runner()));
+ decoder_.reset(new MediaCodecAudioDecoder(
+ scoped_task_environment_.GetMainThreadTaskRunner()));
break;
#endif
}
@@ -392,7 +393,7 @@
// that the decoder can be reinitialized with different parameters.
TestParams params_;
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
NullMediaLog media_log_;
scoped_refptr<DecoderBuffer> data_;
diff --git a/media/filters/dav1d_video_decoder_unittest.cc b/media/filters/dav1d_video_decoder_unittest.cc
index 21f1e91..27eb02a 100644
--- a/media/filters/dav1d_video_decoder_unittest.cc
+++ b/media/filters/dav1d_video_decoder_unittest.cc
@@ -9,8 +9,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "build/build_config.h"
#include "media/base/decoder_buffer.h"
#include "media/base/limits.h"
@@ -172,7 +172,7 @@
testing::StrictMock<MockMediaLog> media_log_;
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
std::unique_ptr<Dav1dVideoDecoder> decoder_;
scoped_refptr<DecoderBuffer> i_frame_buffer_;
diff --git a/media/filters/decrypting_audio_decoder_unittest.cc b/media/filters/decrypting_audio_decoder_unittest.cc
index 3364873d..62a6fd5 100644
--- a/media/filters/decrypting_audio_decoder_unittest.cc
+++ b/media/filters/decrypting_audio_decoder_unittest.cc
@@ -9,9 +9,9 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
+#include "base/test/scoped_task_environment.h"
#include "media/base/audio_buffer.h"
#include "media/base/decoder_buffer.h"
#include "media/base/decrypt_config.h"
@@ -55,8 +55,9 @@
class DecryptingAudioDecoderTest : public testing::Test {
public:
DecryptingAudioDecoderTest()
- : decoder_(new DecryptingAudioDecoder(message_loop_.task_runner(),
- &media_log_)),
+ : decoder_(new DecryptingAudioDecoder(
+ scoped_task_environment_.GetMainThreadTaskRunner(),
+ &media_log_)),
cdm_context_(new StrictMock<MockCdmContext>()),
decryptor_(new StrictMock<MockDecryptor>()),
num_decrypt_and_decode_calls_(0),
@@ -242,7 +243,7 @@
MOCK_METHOD1(OnWaiting, void(WaitingReason));
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
NullMediaLog media_log_;
std::unique_ptr<DecryptingAudioDecoder> decoder_;
std::unique_ptr<StrictMock<MockCdmContext>> cdm_context_;
diff --git a/media/filters/decrypting_demuxer_stream_unittest.cc b/media/filters/decrypting_demuxer_stream_unittest.cc
index ab865a4..3b83b5c 100644
--- a/media/filters/decrypting_demuxer_stream_unittest.cc
+++ b/media/filters/decrypting_demuxer_stream_unittest.cc
@@ -9,9 +9,9 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
+#include "base/test/scoped_task_environment.h"
#include "media/base/decoder_buffer.h"
#include "media/base/decrypt_config.h"
#include "media/base/gmock_callback_support.h"
@@ -68,7 +68,7 @@
public:
DecryptingDemuxerStreamTest()
: demuxer_stream_(new DecryptingDemuxerStream(
- message_loop_.task_runner(),
+ scoped_task_environment_.GetMainThreadTaskRunner(),
&media_log_,
base::Bind(&DecryptingDemuxerStreamTest::OnWaiting,
base::Unretained(this)))),
@@ -263,7 +263,7 @@
void(DemuxerStream::Status, scoped_refptr<DecoderBuffer>));
MOCK_METHOD1(OnWaiting, void(WaitingReason));
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
StrictMock<MockMediaLog> media_log_;
std::unique_ptr<DecryptingDemuxerStream> demuxer_stream_;
std::unique_ptr<StrictMock<MockCdmContext>> cdm_context_;
diff --git a/media/filters/decrypting_video_decoder_unittest.cc b/media/filters/decrypting_video_decoder_unittest.cc
index 700c56e..adc3b93 100644
--- a/media/filters/decrypting_video_decoder_unittest.cc
+++ b/media/filters/decrypting_video_decoder_unittest.cc
@@ -9,9 +9,9 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
+#include "base/test/scoped_task_environment.h"
#include "media/base/decoder_buffer.h"
#include "media/base/decrypt_config.h"
#include "media/base/gmock_callback_support.h"
@@ -49,8 +49,9 @@
class DecryptingVideoDecoderTest : public testing::Test {
public:
DecryptingVideoDecoderTest()
- : decoder_(new DecryptingVideoDecoder(message_loop_.task_runner(),
- &media_log_)),
+ : decoder_(new DecryptingVideoDecoder(
+ scoped_task_environment_.GetMainThreadTaskRunner(),
+ &media_log_)),
cdm_context_(new StrictMock<MockCdmContext>()),
decryptor_(new StrictMock<MockDecryptor>()),
num_decrypt_and_decode_calls_(0),
@@ -219,7 +220,7 @@
MOCK_METHOD1(OnWaiting, void(WaitingReason));
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
NullMediaLog media_log_;
std::unique_ptr<DecryptingVideoDecoder> decoder_;
std::unique_ptr<StrictMock<MockCdmContext>> cdm_context_;
diff --git a/media/filters/fake_video_decoder_unittest.cc b/media/filters/fake_video_decoder_unittest.cc
index 5718ace..a1a729d 100644
--- a/media/filters/fake_video_decoder_unittest.cc
+++ b/media/filters/fake_video_decoder_unittest.cc
@@ -6,8 +6,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "media/base/decoder_buffer.h"
#include "media/base/mock_filters.h"
#include "media/base/test_helpers.h"
@@ -221,7 +221,7 @@
DCHECK(!is_reset_pending_);
}
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
VideoDecoderConfig current_config_;
std::unique_ptr<FakeVideoDecoder> decoder_;
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index 782d4bc..d152322 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -14,9 +14,9 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/singleton.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/strings/string_util.h"
+#include "base/test/scoped_task_environment.h"
#include "media/base/decoder_buffer.h"
#include "media/base/gmock_callback_support.h"
#include "media/base/limits.h"
@@ -201,7 +201,7 @@
StrictMock<MockMediaLog> media_log_;
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
std::unique_ptr<FFmpegVideoDecoder> decoder_;
// Various buffers for testing.
diff --git a/media/filters/frame_processor_unittest.cc b/media/filters/frame_processor_unittest.cc
index ba29731..507f4f8 100644
--- a/media/filters/frame_processor_unittest.cc
+++ b/media/filters/frame_processor_unittest.cc
@@ -12,11 +12,11 @@
#include "base/bind.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
+#include "base/test/scoped_task_environment.h"
#include "base/time/time.h"
#include "media/base/media_log.h"
#include "media/base/media_util.h"
@@ -298,7 +298,7 @@
stream->StartReturningData();
}
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
StrictMock<MockMediaLog> media_log_;
StrictMock<FrameProcessorTestCallbackHelper> callbacks_;
diff --git a/media/filters/pipeline_controller_unittest.cc b/media/filters/pipeline_controller_unittest.cc
index 56ba5839..54569dc3 100644
--- a/media/filters/pipeline_controller_unittest.cc
+++ b/media/filters/pipeline_controller_unittest.cc
@@ -11,8 +11,8 @@
#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "base/time/time.h"
#include "media/base/gmock_callback_support.h"
#include "media/base/mock_filters.h"
@@ -157,7 +157,7 @@
void OnVideoDecoderChange(const std::string& name) override {}
void OnRemotePlayStateChange(MediaStatus::State state) override {}
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
NiceMock<MockDemuxer> demuxer_;
StrictMock<MockPipeline>* pipeline_;
diff --git a/media/filters/video_decoder_stream_unittest.cc b/media/filters/video_decoder_stream_unittest.cc
index d68466e..f2e38c7 100644
--- a/media/filters/video_decoder_stream_unittest.cc
+++ b/media/filters/video_decoder_stream_unittest.cc
@@ -8,9 +8,9 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
+#include "base/test/scoped_task_environment.h"
#include "build/build_config.h"
#include "media/base/fake_demuxer_stream.h"
#include "media/base/gmock_callback_support.h"
@@ -84,7 +84,7 @@
has_no_key_(false) {
video_decoder_stream_.reset(new VideoDecoderStream(
std::make_unique<VideoDecoderStream::StreamTraits>(&media_log_),
- message_loop_.task_runner(),
+ scoped_task_environment_.GetMainThreadTaskRunner(),
base::BindRepeating(&VideoDecoderStreamTest::CreateVideoDecodersForTest,
base::Unretained(this)),
&media_log_));
@@ -138,7 +138,7 @@
void PrepareFrame(scoped_refptr<VideoFrame> frame,
VideoDecoderStream::OutputReadyCB output_ready_cb) {
// Simulate some delay in return of the output.
- message_loop_.task_runner()->PostTask(
+ scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE,
base::BindOnce(std::move(output_ready_cb), std::move(frame)));
}
@@ -166,7 +166,7 @@
// Note this is _not_ inserted into |decoders_| below, so we don't need to
// adjust the indices used below to compensate.
decoders.push_back(std::make_unique<DecryptingVideoDecoder>(
- message_loop_.task_runner(), &media_log_));
+ scoped_task_environment_.GetMainThreadTaskRunner(), &media_log_));
#endif
for (int i = 0; i < 3; ++i) {
@@ -462,7 +462,7 @@
SatisfyPendingCallback(DECODER_REINIT);
}
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
StrictMock<MockMediaLog> media_log_;
std::unique_ptr<VideoDecoderStream> video_decoder_stream_;
diff --git a/media/mojo/clients/mojo_android_overlay_unittest.cc b/media/mojo/clients/mojo_android_overlay_unittest.cc
index ca214cd..744f401f7 100644
--- a/media/mojo/clients/mojo_android_overlay_unittest.cc
+++ b/media/mojo/clients/mojo_android_overlay_unittest.cc
@@ -8,8 +8,8 @@
#include "base/bind.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "gpu/ipc/common/gpu_surface_tracker.h"
#include "media/base/mock_filters.h"
#include "media/mojo/clients/mojo_android_overlay.h"
@@ -155,7 +155,7 @@
}
// Mojo stuff.
- base::MessageLoop loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
// The mock provider that |overlay_client_| will talk to.
// |interface_provider_| will bind it.
diff --git a/media/mojo/clients/mojo_audio_decoder_unittest.cc b/media/mojo/clients/mojo_audio_decoder_unittest.cc
index f952283..51fce89e 100644
--- a/media/mojo/clients/mojo_audio_decoder_unittest.cc
+++ b/media/mojo/clients/mojo_audio_decoder_unittest.cc
@@ -7,9 +7,9 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
+#include "base/test/scoped_task_environment.h"
#include "base/threading/thread.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/audio_timestamp_helper.h"
@@ -63,8 +63,9 @@
base::BindOnce(&MojoAudioDecoderTest::ConnectToService,
base::Unretained(this),
base::Passed(mojo::MakeRequest(&remote_audio_decoder))));
- mojo_audio_decoder_.reset(new MojoAudioDecoder(
- message_loop_.task_runner(), std::move(remote_audio_decoder)));
+ mojo_audio_decoder_.reset(
+ new MojoAudioDecoder(scoped_task_environment_.GetMainThreadTaskRunner(),
+ std::move(remote_audio_decoder)));
}
~MojoAudioDecoderTest() override {
@@ -216,7 +217,7 @@
RunLoop();
}
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
std::unique_ptr<base::RunLoop> run_loop_;
// The MojoAudioDecoder that we are testing.
diff --git a/media/mojo/clients/mojo_video_encode_accelerator_unittest.cc b/media/mojo/clients/mojo_video_encode_accelerator_unittest.cc
index 82e39c2..aaf4d8e5 100644
--- a/media/mojo/clients/mojo_video_encode_accelerator_unittest.cc
+++ b/media/mojo/clients/mojo_video_encode_accelerator_unittest.cc
@@ -4,8 +4,8 @@
#include <stddef.h>
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "gpu/config/gpu_info.h"
#include "media/mojo/clients/mojo_video_encode_accelerator.h"
#include "media/mojo/interfaces/video_encode_accelerator.mojom.h"
@@ -172,7 +172,7 @@
}
private:
- const base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
// This member holds on to the mock implementation of the "service" side.
mojo::StrongBindingPtr<mojom::VideoEncodeAccelerator> mojo_vea_binding_;
diff --git a/media/mojo/common/mojo_data_pipe_read_write_unittest.cc b/media/mojo/common/mojo_data_pipe_read_write_unittest.cc
index 045a889..d0abf64 100644
--- a/media/mojo/common/mojo_data_pipe_read_write_unittest.cc
+++ b/media/mojo/common/mojo_data_pipe_read_write_unittest.cc
@@ -9,9 +9,9 @@
#include <memory>
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/test/mock_callback.h"
+#include "base/test/scoped_task_environment.h"
#include "media/base/decoder_buffer.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -67,7 +67,7 @@
} // namespace
TEST(MojoDataPipeReadWriteTest, Normal) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
std::string kData = "hello, world";
MojoDataPipeReadWrite pipe_read_write_;
pipe_read_write_.WriteAndRead(reinterpret_cast<const uint8_t*>(kData.data()),
@@ -75,7 +75,7 @@
}
TEST(MojoDataPipeReadWriteTest, SequentialReading) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
std::string kData1 = "hello, world";
std::string kData2 = "Bye!";
MojoDataPipeReadWrite pipe_read_write_;
@@ -86,7 +86,7 @@
}
TEST(MojoDataPipeReadWriteTest, LongerThanCapacity) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
std::string kData = "hello, world, hello, world, hello, world";
MojoDataPipeReadWrite pipe_read_write_(10);
pipe_read_write_.WriteAndRead(reinterpret_cast<const uint8_t*>(kData.data()),
@@ -94,7 +94,7 @@
}
TEST(MojoDataPipeReadWriteTest, DiscardDataInPipe) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
std::string kData1 = "to be discarded";
std::string kData2 = "hello, world, hello, world, hello, world";
MojoDataPipeReadWrite pipe_read_write_(10);
diff --git a/media/mojo/common/mojo_decoder_buffer_converter_unittest.cc b/media/mojo/common/mojo_decoder_buffer_converter_unittest.cc
index afd0a87a..db659da 100644
--- a/media/mojo/common/mojo_decoder_buffer_converter_unittest.cc
+++ b/media/mojo/common/mojo_decoder_buffer_converter_unittest.cc
@@ -8,10 +8,10 @@
#include <memory>
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
#include "base/test/mock_callback.h"
+#include "base/test/scoped_task_environment.h"
#include "media/base/decoder_buffer.h"
#include "media/base/decrypt_config.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -59,7 +59,7 @@
} // namespace
TEST(MojoDecoderBufferConverterTest, ConvertDecoderBuffer_Normal) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
const uint8_t kData[] = "hello, world";
const uint8_t kSideData[] = "sideshow bob";
const size_t kDataSize = base::size(kData);
@@ -79,7 +79,7 @@
}
TEST(MojoDecoderBufferConverterTest, ConvertDecoderBuffer_EOS) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
scoped_refptr<DecoderBuffer> buffer(DecoderBuffer::CreateEOSBuffer());
MojoDecoderBufferConverter converter;
@@ -89,7 +89,7 @@
// TODO(xhwang): Investigate whether we can get rid of zero-byte-buffer.
// See http://crbug.com/663438
TEST(MojoDecoderBufferConverterTest, ConvertDecoderBuffer_ZeroByteBuffer) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
scoped_refptr<DecoderBuffer> buffer(new DecoderBuffer(0));
MojoDecoderBufferConverter converter;
@@ -97,7 +97,7 @@
}
TEST(MojoDecoderBufferConverterTest, ConvertDecoderBuffer_KeyFrame) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
const uint8_t kData[] = "hello, world";
const size_t kDataSize = base::size(kData);
@@ -111,7 +111,7 @@
}
TEST(MojoDecoderBufferConverterTest, ConvertDecoderBuffer_EncryptedBuffer) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
const uint8_t kData[] = "hello, world";
const size_t kDataSize = base::size(kData);
const char kKeyId[] = "00112233445566778899aabbccddeeff";
@@ -150,7 +150,7 @@
// This test verifies that a DecoderBuffer larger than data-pipe capacity
// can be transmitted properly.
TEST(MojoDecoderBufferConverterTest, Chunked) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
const uint8_t kData[] = "Lorem ipsum dolor sit amet, consectetur cras amet";
const size_t kDataSize = base::size(kData);
scoped_refptr<DecoderBuffer> buffer =
@@ -163,7 +163,7 @@
// This test verifies that MojoDecoderBufferReader::ReadCB is called with a
// NULL DecoderBuffer if data pipe is closed during transmission.
TEST(MojoDecoderBufferConverterTest, WriterSidePipeError) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
const uint8_t kData[] = "Lorem ipsum dolor sit amet, consectetur cras amet";
const size_t kDataSize = base::size(kData);
scoped_refptr<DecoderBuffer> media_buffer =
@@ -191,7 +191,7 @@
// This test verifies that MojoDecoderBuffer supports concurrent writes and
// reads.
TEST(MojoDecoderBufferConverterTest, ConcurrentDecoderBuffers) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
base::RunLoop run_loop;
// Prevent all of the buffers from fitting at once to exercise the chunking
@@ -237,7 +237,7 @@
}
TEST(MojoDecoderBufferConverterTest, FlushWithoutRead) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
base::RunLoop run_loop;
base::MockCallback<base::OnceClosure> mock_flush_cb;
@@ -250,7 +250,7 @@
}
TEST(MojoDecoderBufferConverterTest, FlushAfterRead) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
base::RunLoop run_loop;
const uint8_t kData[] = "Lorem ipsum dolor sit amet, consectetur cras amet";
@@ -271,7 +271,7 @@
}
TEST(MojoDecoderBufferConverterTest, FlushBeforeRead) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
base::RunLoop run_loop;
const uint8_t kData[] = "Lorem ipsum dolor sit amet, consectetur cras amet";
@@ -299,7 +299,7 @@
}
TEST(MojoDecoderBufferConverterTest, FlushBeforeChunkedRead) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
base::RunLoop run_loop;
const uint8_t kData[] = "Lorem ipsum dolor sit amet, consectetur cras amet";
@@ -328,7 +328,7 @@
}
TEST(MojoDecoderBufferConverterTest, FlushDuringChunkedRead) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
base::RunLoop run_loop;
const uint8_t kData[] = "Lorem ipsum dolor sit amet, consectetur cras amet";
@@ -357,7 +357,7 @@
}
TEST(MojoDecoderBufferConverterTest, FlushDuringConcurrentReads) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
base::RunLoop run_loop;
// Prevent all of the buffers from fitting at once to exercise the chunking
diff --git a/media/mojo/services/mojo_video_encode_accelerator_service_unittest.cc b/media/mojo/services/mojo_video_encode_accelerator_service_unittest.cc
index 592feda..1b4f101 100644
--- a/media/mojo/services/mojo_video_encode_accelerator_service_unittest.cc
+++ b/media/mojo/services/mojo_video_encode_accelerator_service_unittest.cc
@@ -6,8 +6,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "gpu/config/gpu_preferences.h"
#include "media/mojo/interfaces/video_encode_accelerator.mojom.h"
#include "media/mojo/services/mojo_video_encode_accelerator_service.h"
@@ -120,7 +120,7 @@
}
private:
- const base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
mojo::StrongBindingPtr<mojom::VideoEncodeAcceleratorClient> mojo_vea_binding_;
diff --git a/media/mojo/services/watch_time_recorder_unittest.cc b/media/mojo/services/watch_time_recorder_unittest.cc
index 32fc1c2..404c7c3 100644
--- a/media/mojo/services/watch_time_recorder_unittest.cc
+++ b/media/mojo/services/watch_time_recorder_unittest.cc
@@ -9,10 +9,10 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/hash/hash.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "base/test/metrics/histogram_tester.h"
+#include "base/test/scoped_task_environment.h"
#include "base/test/test_message_loop.h"
#include "base/threading/thread_task_runner_handle.h"
#include "components/ukm/test_ukm_recorder.h"
@@ -156,7 +156,7 @@
MOCK_METHOD0(GetCurrentMediaTime, base::TimeDelta());
protected:
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
mojom::MediaMetricsProviderPtr provider_;
std::unique_ptr<base::HistogramTester> histogram_tester_;
std::unique_ptr<ukm::TestAutoSetUkmRecorder> test_recorder_;
diff --git a/media/mojo/test/mojo_video_encode_accelerator_integration_test.cc b/media/mojo/test/mojo_video_encode_accelerator_integration_test.cc
index d1ef47ee..98bc3aa 100644
--- a/media/mojo/test/mojo_video_encode_accelerator_integration_test.cc
+++ b/media/mojo/test/mojo_video_encode_accelerator_integration_test.cc
@@ -6,9 +6,9 @@
#include <memory>
#include "base/bind.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/test/gtest_util.h"
+#include "base/test/scoped_task_environment.h"
#include "gpu/config/gpu_preferences.h"
#include "media/base/limits.h"
#include "media/mojo/clients/mojo_video_encode_accelerator.h"
@@ -107,7 +107,7 @@
}
private:
- const base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
// This member holds on to the implementation of the "service" side.
mojo::StrongBindingPtr<mojom::VideoEncodeAccelerator> mojo_vea_binding_;
diff --git a/media/renderers/paint_canvas_video_renderer_unittest.cc b/media/renderers/paint_canvas_video_renderer_unittest.cc
index 991c8647..9dccbedb 100644
--- a/media/renderers/paint_canvas_video_renderer_unittest.cc
+++ b/media/renderers/paint_canvas_video_renderer_unittest.cc
@@ -8,7 +8,7 @@
#include "base/bind.h"
#include "base/macros.h"
#include "base/memory/aligned_memory.h"
-#include "base/message_loop/message_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "cc/paint/paint_flags.h"
#include "cc/paint/skia_paint_canvas.h"
#include "components/viz/common/gpu/context_provider.h"
@@ -111,7 +111,7 @@
SkBitmap bitmap_;
cc::SkiaPaintCanvas target_canvas_;
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
DISALLOW_COPY_AND_ASSIGN(PaintCanvasVideoRendererTest);
};
diff --git a/media/renderers/renderer_impl_unittest.cc b/media/renderers/renderer_impl_unittest.cc
index cadf707..445a37c3 100644
--- a/media/renderers/renderer_impl_unittest.cc
+++ b/media/renderers/renderer_impl_unittest.cc
@@ -10,9 +10,9 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
#include "base/optional.h"
#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "base/test/simple_test_tick_clock.h"
#include "base/threading/thread_task_runner_handle.h"
#include "media/base/gmock_callback_support.h"
@@ -82,7 +82,7 @@
video_renderer_(new StrictMock<MockVideoRenderer>()),
audio_renderer_(new StrictMock<MockAudioRenderer>()),
renderer_impl_(
- new RendererImpl(message_loop_.task_runner(),
+ new RendererImpl(scoped_task_environment_.GetMainThreadTaskRunner(),
std::unique_ptr<AudioRenderer>(audio_renderer_),
std::unique_ptr<VideoRenderer>(video_renderer_))),
cdm_context_(new StrictMock<MockCdmContext>()),
@@ -336,7 +336,7 @@
}
// Fixture members.
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
StrictMock<CallbackHelper> callbacks_;
base::SimpleTestTickClock test_tick_clock_;
diff --git a/media/renderers/video_resource_updater_unittest.cc b/media/renderers/video_resource_updater_unittest.cc
index af40660..fdeeb77 100644
--- a/media/renderers/video_resource_updater_unittest.cc
+++ b/media/renderers/video_resource_updater_unittest.cc
@@ -8,7 +8,7 @@
#include <stdint.h>
#include "base/bind.h"
-#include "base/message_loop/message_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "components/viz/client/client_resource_provider.h"
#include "components/viz/client/shared_bitmap_reporter.h"
#include "components/viz/test/fake_output_surface.h"
@@ -244,7 +244,7 @@
// VideoResourceUpdater registers as a MemoryDumpProvider, which requires
// a TaskRunner.
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
UploadCounterGLES2Interface* gl_;
scoped_refptr<viz::TestContextProvider> context_provider_;
FakeSharedBitmapReporter shared_bitmap_reporter_;