diff options
author | mikhal@chromium.org <mikhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 17:58:44 +0000 |
---|---|---|
committer | mikhal@chromium.org <mikhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 17:58:44 +0000 |
commit | 33c8d63633265768c2e1894adfc3b198f5d64f94 (patch) | |
tree | e8c1214f3dd52b222eb4f0eaa3e2e632bfdab0a5 /media/cast/video_sender | |
parent | b5a18ca0f19958c29a787fe52993b1513774a537 (diff) | |
download | chromium_src-33c8d63633265768c2e1894adfc3b198f5d64f94.zip chromium_src-33c8d63633265768c2e1894adfc3b198f5d64f94.tar.gz chromium_src-33c8d63633265768c2e1894adfc3b198f5d64f94.tar.bz2 |
Cast:Switching to SingleThreadTaskRunner
BUG= 337558
Review URL: https://codereview.chromium.org/151663002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/cast/video_sender')
-rw-r--r-- | media/cast/video_sender/external_video_encoder_unittest.cc | 6 | ||||
-rw-r--r-- | media/cast/video_sender/video_encoder_impl_unittest.cc | 6 | ||||
-rw-r--r-- | media/cast/video_sender/video_sender_unittest.cc | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/media/cast/video_sender/external_video_encoder_unittest.cc b/media/cast/video_sender/external_video_encoder_unittest.cc index f932cb53..4e97416 100644 --- a/media/cast/video_sender/external_video_encoder_unittest.cc +++ b/media/cast/video_sender/external_video_encoder_unittest.cc @@ -11,7 +11,7 @@ #include "media/cast/cast_defines.h" #include "media/cast/cast_environment.h" #include "media/cast/test/fake_gpu_video_accelerator_factories.h" -#include "media/cast/test/fake_task_runner.h" +#include "media/cast/test/fake_single_thread_task_runner.h" #include "media/cast/test/fake_video_encode_accelerator.h" #include "media/cast/test/utility/video_utility.h" #include "media/cast/video_sender/external_video_encoder.h" @@ -90,7 +90,7 @@ class ExternalVideoEncoderTest : public ::testing::Test { virtual void SetUp() { testing_clock_ = new base::SimpleTestTickClock(); - task_runner_ = new test::FakeTaskRunner(testing_clock_); + task_runner_ = new test::FakeSingleThreadTaskRunner(testing_clock_); cast_environment_ = new CastEnvironment( scoped_ptr<base::TickClock>(testing_clock_).Pass(), task_runner_, task_runner_, task_runner_, task_runner_, task_runner_, task_runner_, @@ -104,7 +104,7 @@ class ExternalVideoEncoderTest : public ::testing::Test { base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment. scoped_refptr<TestVideoEncoderCallback> test_video_encoder_callback_; VideoSenderConfig video_config_; - scoped_refptr<test::FakeTaskRunner> task_runner_; + scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_; scoped_ptr<VideoEncoder> video_encoder_; scoped_refptr<media::VideoFrame> video_frame_; scoped_refptr<CastEnvironment> cast_environment_; diff --git a/media/cast/video_sender/video_encoder_impl_unittest.cc b/media/cast/video_sender/video_encoder_impl_unittest.cc index 0ae009b..22855cf8 100644 --- a/media/cast/video_sender/video_encoder_impl_unittest.cc +++ b/media/cast/video_sender/video_encoder_impl_unittest.cc @@ -10,7 +10,7 @@ #include "media/base/video_frame.h" #include "media/cast/cast_defines.h" #include "media/cast/cast_environment.h" -#include "media/cast/test/fake_task_runner.h" +#include "media/cast/test/fake_single_thread_task_runner.h" #include "media/cast/test/utility/video_utility.h" #include "media/cast/video_sender/video_encoder_impl.h" #include "testing/gmock/include/gmock/gmock.h" @@ -87,7 +87,7 @@ class VideoEncoderImplTest : public ::testing::Test { virtual void SetUp() OVERRIDE { testing_clock_ = new base::SimpleTestTickClock(); - task_runner_ = new test::FakeTaskRunner(testing_clock_); + task_runner_ = new test::FakeSingleThreadTaskRunner(testing_clock_); cast_environment_ = new CastEnvironment( scoped_ptr<base::TickClock>(testing_clock_).Pass(), task_runner_, task_runner_, task_runner_, task_runner_, task_runner_, @@ -107,7 +107,7 @@ class VideoEncoderImplTest : public ::testing::Test { base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment. scoped_refptr<TestVideoEncoderCallback> test_video_encoder_callback_; VideoSenderConfig video_config_; - scoped_refptr<test::FakeTaskRunner> task_runner_; + scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_; scoped_ptr<VideoEncoder> video_encoder_; scoped_refptr<media::VideoFrame> video_frame_; diff --git a/media/cast/video_sender/video_sender_unittest.cc b/media/cast/video_sender/video_sender_unittest.cc index add51a3..a5871ce 100644 --- a/media/cast/video_sender/video_sender_unittest.cc +++ b/media/cast/video_sender/video_sender_unittest.cc @@ -10,7 +10,7 @@ #include "media/base/video_frame.h" #include "media/cast/cast_environment.h" #include "media/cast/test/fake_gpu_video_accelerator_factories.h" -#include "media/cast/test/fake_task_runner.h" +#include "media/cast/test/fake_single_thread_task_runner.h" #include "media/cast/test/utility/video_utility.h" #include "media/cast/transport/cast_transport_config.h" #include "media/cast/transport/cast_transport_sender_impl.h" @@ -85,7 +85,7 @@ class VideoSenderTest : public ::testing::Test { testing_clock_ = new base::SimpleTestTickClock(); testing_clock_->Advance( base::TimeDelta::FromMilliseconds(kStartMillisecond)); - task_runner_ = new test::FakeTaskRunner(testing_clock_); + task_runner_ = new test::FakeSingleThreadTaskRunner(testing_clock_); cast_environment_ = new CastEnvironment( scoped_ptr<base::TickClock>(testing_clock_).Pass(), task_runner_, task_runner_, task_runner_, task_runner_, @@ -170,7 +170,7 @@ class VideoSenderTest : public ::testing::Test { base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment. TestPacketSender transport_; scoped_ptr<transport::CastTransportSenderImpl> transport_sender_; - scoped_refptr<test::FakeTaskRunner> task_runner_; + scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_; scoped_ptr<PeerVideoSender> video_sender_; scoped_refptr<CastEnvironment> cast_environment_; |