Index: components/nacl/browser/nacl_process_host.cc |
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc |
index da6c3e113af3a6fa6cd8dbaef409831d055378b2..4c719fd5ded2ac1a181bbdfb66d82448b8852b53 100644 |
--- a/components/nacl/browser/nacl_process_host.cc |
+++ b/components/nacl/browser/nacl_process_host.cc |
@@ -12,18 +12,20 @@ |
#include "base/bind.h" |
#include "base/command_line.h" |
#include "base/files/file_util.h" |
-#include "base/message_loop/message_loop.h" |
+#include "base/location.h" |
#include "base/metrics/histogram.h" |
#include "base/path_service.h" |
#include "base/process/launch.h" |
#include "base/process/process_iterator.h" |
#include "base/rand_util.h" |
+#include "base/single_thread_task_runner.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/string_split.h" |
#include "base/strings/string_util.h" |
#include "base/strings/stringprintf.h" |
#include "base/strings/utf_string_conversions.h" |
#include "base/sys_byteorder.h" |
+#include "base/thread_task_runner_handle.h" |
#include "base/threading/sequenced_worker_pool.h" |
#include "base/win/windows_version.h" |
#include "build/build_config.h" |
@@ -1133,10 +1135,8 @@ bool NaClProcessHost::StartPPAPIProxy(ScopedChannelHandle channel_handle) { |
DCHECK_EQ(PROCESS_TYPE_NACL_LOADER, process_->GetData().process_type); |
ipc_proxy_channel_ = IPC::ChannelProxy::Create( |
- channel_handle.release(), |
- IPC::Channel::MODE_CLIENT, |
- NULL, |
- base::MessageLoopProxy::current().get()); |
+ channel_handle.release(), IPC::Channel::MODE_CLIENT, NULL, |
+ base::ThreadTaskRunnerHandle::Get().get()); |
// Create the browser ppapi host and enable PPAPI message dispatching to the |
// browser process. |
ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess( |
@@ -1383,8 +1383,7 @@ bool NaClProcessHost::AttachDebugExceptionHandler(const std::string& info, |
info); |
} else { |
NaClStartDebugExceptionHandlerThread( |
- process.Pass(), info, |
- base::MessageLoopProxy::current(), |
+ process.Pass(), info, base::ThreadTaskRunnerHandle::Get(), |
base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
weak_factory_.GetWeakPtr())); |
return true; |