Commit affba9d8 authored by Carlos Caballero's avatar Carlos Caballero Committed by Commit Bot

Remove MessageLoop references in /media/remoting

MessageLoop is going away soon.

This CL was uploaded by git cl split.

R=mfoltz@chromium.org

Bug: 891670
Change-Id: I1678e50cd81155739b1493f68de637bc781abcb9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1943186
Auto-Submit: Carlos Caballero <carlscab@google.com>
Reviewed-by: default avatarmark a. foltz <mfoltz@chromium.org>
Commit-Queue: mark a. foltz <mfoltz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720590}
parent e5e06120
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/callback_helpers.h" #include "base/callback_helpers.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/single_thread_task_runner.h" #include "base/single_thread_task_runner.h"
#include "base/test/task_environment.h"
#include "media/base/decoder_buffer.h" #include "media/base/decoder_buffer.h"
#include "media/base/demuxer_stream.h" #include "media/base/demuxer_stream.h"
#include "media/remoting/fake_media_resource.h" #include "media/remoting/fake_media_resource.h"
...@@ -130,7 +130,8 @@ class DemuxerStreamAdapterTest : public ::testing::Test { ...@@ -130,7 +130,8 @@ class DemuxerStreamAdapterTest : public ::testing::Test {
stream_sender.InitWithNewPipeAndPassReceiver(), stream_sender.InitWithNewPipeAndPassReceiver(),
std::move(consumer_end))); std::move(consumer_end)));
demuxer_stream_adapter_.reset(new MockDemuxerStreamAdapter( demuxer_stream_adapter_.reset(new MockDemuxerStreamAdapter(
message_loop_.task_runner(), message_loop_.task_runner(), "test", task_environment_.GetMainThreadTaskRunner(),
task_environment_.GetMainThreadTaskRunner(), "test",
demuxer_stream_.get(), std::move(stream_sender), demuxer_stream_.get(), std::move(stream_sender),
std::move(producer_end))); std::move(producer_end)));
// DemuxerStreamAdapter constructor posts task to main thread to // DemuxerStreamAdapter constructor posts task to main thread to
...@@ -147,7 +148,7 @@ class DemuxerStreamAdapterTest : public ::testing::Test { ...@@ -147,7 +148,7 @@ class DemuxerStreamAdapterTest : public ::testing::Test {
void SetUp() override { SetUpDataPipe(); } void SetUp() override { SetUpDataPipe(); }
// TODO(miu): Add separate media thread, to test threading also. // TODO(miu): Add separate media thread, to test threading also.
base::MessageLoop message_loop_; base::test::SingleThreadTaskEnvironment task_environment_;
std::unique_ptr<FakeDemuxerStream> demuxer_stream_; std::unique_ptr<FakeDemuxerStream> demuxer_stream_;
std::unique_ptr<FakeRemotingDataStreamSender> data_stream_sender_; std::unique_ptr<FakeRemotingDataStreamSender> data_stream_sender_;
std::unique_ptr<MockDemuxerStreamAdapter> demuxer_stream_adapter_; std::unique_ptr<MockDemuxerStreamAdapter> demuxer_stream_adapter_;
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
#include <memory> #include <memory>
#include "base/callback.h" #include "base/callback.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/test/simple_test_tick_clock.h" #include "base/test/simple_test_tick_clock.h"
#include "base/test/task_environment.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "media/base/audio_decoder_config.h" #include "media/base/audio_decoder_config.h"
#include "media/base/cdm_config.h" #include "media/base/cdm_config.h"
...@@ -164,7 +164,7 @@ class RendererControllerTest : public ::testing::Test, ...@@ -164,7 +164,7 @@ class RendererControllerTest : public ::testing::Test,
EXPECT_FALSE(IsInDelayedStart()); EXPECT_FALSE(IsInDelayedStart());
} }
base::MessageLoop message_loop_; base::test::SingleThreadTaskEnvironment task_environment_;
protected: protected:
bool is_rendering_remotely_ = false; bool is_rendering_remotely_ = false;
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#include "base/callback_helpers.h" #include "base/callback_helpers.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "media/remoting/media_remoting_rpc.pb.h" #include "media/remoting/media_remoting_rpc.pb.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -133,7 +133,7 @@ TEST_F(RpcBrokerTest, TestProcessMessageFromRemoteUnregistered) { ...@@ -133,7 +133,7 @@ TEST_F(RpcBrokerTest, TestProcessMessageFromRemoteUnregistered) {
} }
TEST_F(RpcBrokerTest, TestSendMessageToRemote) { TEST_F(RpcBrokerTest, TestSendMessageToRemote) {
std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop()); base::test::SingleThreadTaskEnvironment task_environment;
std::unique_ptr<FakeMessageSender> fake_sender(new FakeMessageSender()); std::unique_ptr<FakeMessageSender> fake_sender(new FakeMessageSender());
ASSERT_FALSE(fake_sender->has_sent_message()); ASSERT_FALSE(fake_sender->has_sent_message());
...@@ -150,7 +150,7 @@ TEST_F(RpcBrokerTest, TestSendMessageToRemote) { ...@@ -150,7 +150,7 @@ TEST_F(RpcBrokerTest, TestSendMessageToRemote) {
} }
TEST_F(RpcBrokerTest, RpcBrokerSendMessageCallback) { TEST_F(RpcBrokerTest, RpcBrokerSendMessageCallback) {
std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop()); base::test::SingleThreadTaskEnvironment task_environment;
std::unique_ptr<FakeMessageSender> fake_sender(new FakeMessageSender()); std::unique_ptr<FakeMessageSender> fake_sender(new FakeMessageSender());
ASSERT_FALSE(fake_sender->has_sent_message()); ASSERT_FALSE(fake_sender->has_sent_message());
......
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