| Index: chrome/renderer/media/cast_session.cc
|
| diff --git a/chrome/renderer/media/cast_session.cc b/chrome/renderer/media/cast_session.cc
|
| index 0983a2b083946f3de9f8d6e011f01a531c012476..326f8273f92ebe3baccc1fe80eb3a0ed99b28174 100644
|
| --- a/chrome/renderer/media/cast_session.cc
|
| +++ b/chrome/renderer/media/cast_session.cc
|
| @@ -4,7 +4,7 @@
|
|
|
| #include "chrome/renderer/media/cast_session.h"
|
|
|
| -#include "base/message_loop/message_loop_proxy.h"
|
| +#include "base/single_thread_task_runner.h"
|
| #include "chrome/renderer/media/cast_session_delegate.h"
|
| #include "content/public/renderer/render_thread.h"
|
| #include "content/public/renderer/video_encode_accelerator.h"
|
| @@ -42,12 +42,12 @@ void CreateVideoEncodeMemory(
|
|
|
| CastSession::CastSession()
|
| : delegate_(new CastSessionDelegate()),
|
| - io_message_loop_proxy_(
|
| + io_task_runner_(
|
| content::RenderThread::Get()->GetIOMessageLoopProxy()) {}
|
|
|
| CastSession::~CastSession() {
|
| // We should always be able to delete the object on the IO thread.
|
| - CHECK(io_message_loop_proxy_->DeleteSoon(FROM_HERE, delegate_.release()));
|
| + CHECK(io_task_runner_->DeleteSoon(FROM_HERE, delegate_.release()));
|
| }
|
|
|
| void CastSession::StartAudio(const media::cast::AudioSenderConfig& config,
|
| @@ -56,7 +56,7 @@ void CastSession::StartAudio(const media::cast::AudioSenderConfig& config,
|
| DCHECK(content::RenderThread::Get()
|
| ->GetTaskRunner()->BelongsToCurrentThread());
|
|
|
| - io_message_loop_proxy_->PostTask(
|
| + io_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&CastSessionDelegate::StartAudio,
|
| base::Unretained(delegate_.get()),
|
| @@ -71,7 +71,7 @@ void CastSession::StartVideo(const media::cast::VideoSenderConfig& config,
|
| DCHECK(content::RenderThread::Get()
|
| ->GetTaskRunner()->BelongsToCurrentThread());
|
|
|
| - io_message_loop_proxy_->PostTask(
|
| + io_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&CastSessionDelegate::StartVideo,
|
| base::Unretained(delegate_.get()),
|
| @@ -87,7 +87,7 @@ void CastSession::StartVideo(const media::cast::VideoSenderConfig& config,
|
| void CastSession::StartUDP(const net::IPEndPoint& remote_endpoint,
|
| scoped_ptr<base::DictionaryValue> options,
|
| const ErrorCallback& error_callback) {
|
| - io_message_loop_proxy_->PostTask(
|
| + io_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(
|
| &CastSessionDelegate::StartUDP,
|
| @@ -99,7 +99,7 @@ void CastSession::StartUDP(const net::IPEndPoint& remote_endpoint,
|
| }
|
|
|
| void CastSession::ToggleLogging(bool is_audio, bool enable) {
|
| - io_message_loop_proxy_->PostTask(
|
| + io_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&CastSessionDelegate::ToggleLogging,
|
| base::Unretained(delegate_.get()),
|
| @@ -110,7 +110,7 @@ void CastSession::ToggleLogging(bool is_audio, bool enable) {
|
| void CastSession::GetEventLogsAndReset(
|
| bool is_audio, const std::string& extra_data,
|
| const EventLogsCallback& callback) {
|
| - io_message_loop_proxy_->PostTask(
|
| + io_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&CastSessionDelegate::GetEventLogsAndReset,
|
| base::Unretained(delegate_.get()),
|
| @@ -121,7 +121,7 @@ void CastSession::GetEventLogsAndReset(
|
|
|
| void CastSession::GetStatsAndReset(bool is_audio,
|
| const StatsCallback& callback) {
|
| - io_message_loop_proxy_->PostTask(
|
| + io_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&CastSessionDelegate::GetStatsAndReset,
|
| base::Unretained(delegate_.get()),
|
|
|