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..6c251fae85cc36b44361f927fa26e08ac0215150 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) |
- : main_thread_("ChromotingMainThread"), |
+ scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) |
+ : capture_thread_("ChromotingCaptureThread"), |
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() { |
@@ -28,7 +28,7 @@ ChromotingHostContext::~ChromotingHostContext() { |
bool ChromotingHostContext::Start() { |
// Start all the threads. |
- bool started = main_thread_.Start() && encode_thread_.Start() && |
+ bool started = capture_thread_.Start() && encode_thread_.Start() && |
jingle_thread_.Start() && desktop_thread_.Start() && |
io_thread_.StartWithOptions( |
base::Thread::Options(MessageLoop::TYPE_IO, 0)) && |
@@ -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::capture_task_runner() { |
+ return capture_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(); |
} |