summaryrefslogtreecommitdiffstats
path: root/remoting/host
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/host')
-rw-r--r--remoting/host/chromoting_host_context.cc3
-rw-r--r--remoting/host/simple_host_process.cc6
2 files changed, 5 insertions, 4 deletions
diff --git a/remoting/host/chromoting_host_context.cc b/remoting/host/chromoting_host_context.cc
index 2f889a1..b3cdaf6 100644
--- a/remoting/host/chromoting_host_context.cc
+++ b/remoting/host/chromoting_host_context.cc
@@ -22,8 +22,7 @@ ChromotingHostContext::~ChromotingHostContext() {
void ChromotingHostContext::Start() {
// Start all the threads.
- main_thread_.StartWithOptions(
- base::Thread::Options(MessageLoop::TYPE_UI, 0));
+ main_thread_.Start();
capture_thread_.Start();
encode_thread_.Start();
jingle_thread_.Start();
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index 8697b3d..035fa32 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -22,9 +22,9 @@
#include "base/command_line.h"
#include "base/file_path.h"
#include "base/logging.h"
+#include "base/nss_util.h"
#include "base/scoped_nsautorelease_pool.h"
#include "base/thread.h"
-#include "base/waitable_event.h"
#include "remoting/host/capturer_fake.h"
#include "remoting/host/chromoting_host.h"
#include "remoting/host/chromoting_host_context.h"
@@ -69,6 +69,8 @@ int main(int argc, char** argv) {
base::AtExitManager exit_manager;
+ base::EnsureNSPRInit();
+
scoped_ptr<remoting::Capturer> capturer;
scoped_ptr<remoting::Encoder> encoder;
scoped_ptr<remoting::EventExecutor> executor;
@@ -130,7 +132,7 @@ int main(int argc, char** argv) {
executor.release());
// Let the chromoting host runs until the shutdown task is executed.
- MessageLoop message_loop;
+ MessageLoop message_loop(MessageLoop::TYPE_UI);
host->Start(NewRunnableFunction(&ShutdownTask, &message_loop));
message_loop.Run();