| Index: remoting/host/chromoting_host_context.cc
|
| diff --git a/remoting/host/chromoting_host_context.cc b/remoting/host/chromoting_host_context.cc
|
| index 480de732922a9282de5dac6a984b884150f6f2ec..4fba57b7c5d68a81b480ae85835e2f3b88c69a86 100644
|
| --- a/remoting/host/chromoting_host_context.cc
|
| +++ b/remoting/host/chromoting_host_context.cc
|
| @@ -8,54 +8,56 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/threading/thread.h"
|
| +#include "remoting/base//auto_thread.h"
|
| #include "remoting/host/url_request_context.h"
|
|
|
| namespace remoting {
|
|
|
| ChromotingHostContext::ChromotingHostContext(
|
| - scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
|
| - : network_thread_("ChromotingNetworkThread"),
|
| - capture_thread_("ChromotingCaptureThread"),
|
| - encode_thread_("ChromotingEncodeThread"),
|
| - desktop_thread_("ChromotingDesktopThread"),
|
| - file_thread_("ChromotingFileIOThread"),
|
| - ui_task_runner_(ui_task_runner) {
|
| + base::SingleThreadTaskRunner* ui_task_runner)
|
| + : ui_task_runner_(ui_task_runner) {
|
| }
|
|
|
| ChromotingHostContext::~ChromotingHostContext() {
|
| }
|
|
|
| bool ChromotingHostContext::Start() {
|
| + network_thread_ = new AutoThread("ChromotingNetworkThread", ui_task_runner_);
|
| + capture_thread_ = new AutoThread("ChromotingCaptureThread", ui_task_runner_);
|
| + encode_thread_ = new AutoThread("ChromotingEncodeThread", ui_task_runner_);
|
| + desktop_thread_ = new AutoThread("ChromotingDesktopThread", ui_task_runner_);
|
| + file_thread_ = new AutoThread("ChromotingFileIOThread", ui_task_runner_);
|
| +
|
| // Start all the threads.
|
| - bool started = capture_thread_.Start() && encode_thread_.Start() &&
|
| - network_thread_.StartWithOptions(base::Thread::Options(
|
| + bool started = capture_thread_->Start() && encode_thread_->Start() &&
|
| + network_thread_->StartWithOptions(base::Thread::Options(
|
| MessageLoop::TYPE_IO, 0)) &&
|
| - desktop_thread_.Start() &&
|
| - file_thread_.StartWithOptions(
|
| + desktop_thread_->Start() &&
|
| + file_thread_->StartWithOptions(
|
| base::Thread::Options(MessageLoop::TYPE_IO, 0));
|
| if (!started)
|
| return false;
|
|
|
| url_request_context_getter_ = new URLRequestContextGetter(
|
| ui_task_runner(), network_task_runner(),
|
| - static_cast<MessageLoopForIO*>(file_thread_.message_loop()));
|
| + static_cast<MessageLoopForIO*>(file_thread_->message_loop()));
|
| return true;
|
| }
|
|
|
| base::SingleThreadTaskRunner* ChromotingHostContext::capture_task_runner() {
|
| - return capture_thread_.message_loop_proxy();
|
| + return capture_thread_;
|
| }
|
|
|
| base::SingleThreadTaskRunner* ChromotingHostContext::encode_task_runner() {
|
| - return encode_thread_.message_loop_proxy();
|
| + return encode_thread_;
|
| }
|
|
|
| base::SingleThreadTaskRunner* ChromotingHostContext::network_task_runner() {
|
| - return network_thread_.message_loop_proxy();
|
| + return network_thread_;
|
| }
|
|
|
| base::SingleThreadTaskRunner* ChromotingHostContext::desktop_task_runner() {
|
| - return desktop_thread_.message_loop_proxy();
|
| + return desktop_thread_;
|
| }
|
|
|
| base::SingleThreadTaskRunner* ChromotingHostContext::ui_task_runner() {
|
| @@ -63,7 +65,7 @@ base::SingleThreadTaskRunner* ChromotingHostContext::ui_task_runner() {
|
| }
|
|
|
| base::SingleThreadTaskRunner* ChromotingHostContext::file_task_runner() {
|
| - return file_thread_.message_loop_proxy();
|
| + return file_thread_;
|
| }
|
|
|
| const scoped_refptr<net::URLRequestContextGetter>&
|
|
|