1 files changed, 7 insertions, 16 deletions
diff --git a/remoting/host/chromoting_host_context.cc b/remoting/host/chromoting_host_context.cc
index 6c251fa..480de73 100644
--- a/remoting/host/chromoting_host_context.cc
+++ b/remoting/host/chromoting_host_context.cc
@@ -9,16 +9,15 @@
 #include "base/bind.h"
 #include "base/threading/thread.h"
 #include "remoting/host/url_request_context.h"
-#include "remoting/jingle_glue/jingle_thread.h"
 
 namespace remoting {
 
 ChromotingHostContext::ChromotingHostContext(
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
-    : capture_thread_("ChromotingCaptureThread"),
+    : network_thread_("ChromotingNetworkThread"),
+      capture_thread_("ChromotingCaptureThread"),
       encode_thread_("ChromotingEncodeThread"),
       desktop_thread_("ChromotingDesktopThread"),
-      io_thread_("ChromotingIOThread"),
       file_thread_("ChromotingFileIOThread"),
       ui_task_runner_(ui_task_runner) {
 }
@@ -29,24 +28,20 @@ ChromotingHostContext::~ChromotingHostContext() {
 bool ChromotingHostContext::Start() {
   // Start all the threads.
   bool started = capture_thread_.Start() && encode_thread_.Start() &&
-      jingle_thread_.Start() && desktop_thread_.Start() &&
-      io_thread_.StartWithOptions(
-          base::Thread::Options(MessageLoop::TYPE_IO, 0)) &&
+      network_thread_.StartWithOptions(base::Thread::Options(
+          MessageLoop::TYPE_IO, 0)) &&
+      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(), io_task_runner(),
+      ui_task_runner(), network_task_runner(),
       static_cast<MessageLoopForIO*>(file_thread_.message_loop()));
   return true;
 }
 
-JingleThread* ChromotingHostContext::jingle_thread() {
-  return &jingle_thread_;
-}
-
 base::SingleThreadTaskRunner* ChromotingHostContext::capture_task_runner() {
   return capture_thread_.message_loop_proxy();
 }
@@ -56,7 +51,7 @@ base::SingleThreadTaskRunner* ChromotingHostContext::encode_task_runner() {
 }
 
 base::SingleThreadTaskRunner* ChromotingHostContext::network_task_runner() {
-  return jingle_thread_.message_loop_proxy();
+  return network_thread_.message_loop_proxy();
 }
 
 base::SingleThreadTaskRunner* ChromotingHostContext::desktop_task_runner() {
@@ -67,10 +62,6 @@ base::SingleThreadTaskRunner* ChromotingHostContext::ui_task_runner() {
   return ui_task_runner_;
 }
 
-base::SingleThreadTaskRunner* ChromotingHostContext::io_task_runner() {
-  return io_thread_.message_loop_proxy();
-}
-
 base::SingleThreadTaskRunner* ChromotingHostContext::file_task_runner() {
   return file_thread_.message_loop_proxy();
 }