| Index: remoting/host/chromoting_host_context.cc
|
| diff --git a/remoting/host/chromoting_host_context.cc b/remoting/host/chromoting_host_context.cc
|
| index 5e9ff7651bbabbd3461f83595bca585df582983c..69e942a5b420cef7c4f658cf0b842d466120a425 100644
|
| --- a/remoting/host/chromoting_host_context.cc
|
| +++ b/remoting/host/chromoting_host_context.cc
|
| @@ -14,13 +14,13 @@
|
| namespace remoting {
|
|
|
| ChromotingHostContext::ChromotingHostContext(
|
| - base::MessageLoopProxy* ui_message_loop)
|
| + scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
|
| : main_thread_("ChromotingMainThread"),
|
| encode_thread_("ChromotingEncodeThread"),
|
| desktop_thread_("ChromotingDesktopThread"),
|
| io_thread_("ChromotingIOThread"),
|
| file_thread_("ChromotingFileIOThread"),
|
| - ui_message_loop_(ui_message_loop) {
|
| + ui_task_runner_(ui_task_runner) {
|
| }
|
|
|
| ChromotingHostContext::~ChromotingHostContext() {
|
| @@ -38,7 +38,7 @@ bool ChromotingHostContext::Start() {
|
| return false;
|
|
|
| url_request_context_getter_ = new URLRequestContextGetter(
|
| - ui_message_loop_, io_thread_.message_loop(),
|
| + ui_task_runner(), io_task_runner(),
|
| static_cast<MessageLoopForIO*>(file_thread_.message_loop()));
|
| return true;
|
| }
|
| @@ -47,31 +47,31 @@ JingleThread* ChromotingHostContext::jingle_thread() {
|
| return &jingle_thread_;
|
| }
|
|
|
| -MessageLoop* ChromotingHostContext::main_message_loop() {
|
| - return main_thread_.message_loop();
|
| +base::SingleThreadTaskRunner* ChromotingHostContext::main_task_runner() {
|
| + return main_thread_.message_loop_proxy();
|
| }
|
|
|
| -MessageLoop* ChromotingHostContext::encode_message_loop() {
|
| - return encode_thread_.message_loop();
|
| +base::SingleThreadTaskRunner* ChromotingHostContext::encode_task_runner() {
|
| + return encode_thread_.message_loop_proxy();
|
| }
|
|
|
| -base::MessageLoopProxy* ChromotingHostContext::network_message_loop() {
|
| +base::SingleThreadTaskRunner* ChromotingHostContext::network_task_runner() {
|
| return jingle_thread_.message_loop_proxy();
|
| }
|
|
|
| -MessageLoop* ChromotingHostContext::desktop_message_loop() {
|
| - return desktop_thread_.message_loop();
|
| +base::SingleThreadTaskRunner* ChromotingHostContext::desktop_task_runner() {
|
| + return desktop_thread_.message_loop_proxy();
|
| }
|
|
|
| -base::MessageLoopProxy* ChromotingHostContext::ui_message_loop() {
|
| - return ui_message_loop_;
|
| +base::SingleThreadTaskRunner* ChromotingHostContext::ui_task_runner() {
|
| + return ui_task_runner_;
|
| }
|
|
|
| -base::MessageLoopProxy* ChromotingHostContext::io_message_loop() {
|
| +base::SingleThreadTaskRunner* ChromotingHostContext::io_task_runner() {
|
| return io_thread_.message_loop_proxy();
|
| }
|
|
|
| -base::MessageLoopProxy* ChromotingHostContext::file_message_loop() {
|
| +base::SingleThreadTaskRunner* ChromotingHostContext::file_task_runner() {
|
| return file_thread_.message_loop_proxy();
|
| }
|
|
|
|
|