summaryrefslogtreecommitdiffstats
path: root/ipc/mojo
diff options
context:
space:
mode:
authorhablich <hablich@chromium.org>2015-11-13 02:28:30 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-13 10:29:30 +0000
commit8d58b89ee2d93d8277290d8b6edbb9cb7bed2acb (patch)
tree821c206e988e0104cf5d60241a9e11eedabe46e7 /ipc/mojo
parent7dc27540ffc9926a324f9bec86be56ab38c9e981 (diff)
downloadchromium_src-8d58b89ee2d93d8277290d8b6edbb9cb7bed2acb.zip
chromium_src-8d58b89ee2d93d8277290d8b6edbb9cb7bed2acb.tar.gz
chromium_src-8d58b89ee2d93d8277290d8b6edbb9cb7bed2acb.tar.bz2
Revert of Fix racy crash in Mandoline child processes. (patchset #4 id:60001 of https://codereview.chromium.org/1439863002/ )
Reason for revert: Fails build on pricise64: https://code.google.com/p/chromium/issues/detail?id=555361 Original issue's description: > Fix racy crash in Mandoline child processes. > > The problem is with the new EDK, the IO task runner pointer needs to be initialized before MojoMessagePump is created (in child_process.cc). The rest of the change is removing the delegate thread from the InitIPCSupport function. > > BUG=478251 > > Committed: https://crrev.com/ee99b2d9ec86aa5bbc69169ea26964a6792d286b > Cr-Commit-Position: refs/heads/master@{#359266} TBR=msw@chromium.org,jam@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=478251 Review URL: https://codereview.chromium.org/1444563002 Cr-Commit-Position: refs/heads/master@{#359528}
Diffstat (limited to 'ipc/mojo')
-rw-r--r--ipc/mojo/scoped_ipc_support.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/mojo/scoped_ipc_support.cc b/ipc/mojo/scoped_ipc_support.cc
index 58ee518..2465aa2 100644
--- a/ipc/mojo/scoped_ipc_support.cc
+++ b/ipc/mojo/scoped_ipc_support.cc
@@ -104,8 +104,8 @@ void IPCSupportInitializer::Init(
io_thread_task_runner_->PostTask(
FROM_HERE, base::Bind(&WatchMessageLoopOnIOThread, observer_));
mojo::embedder::InitIPCSupport(
- mojo::embedder::ProcessType::NONE, this, io_thread_task_runner_,
- mojo::embedder::ScopedPlatformHandle());
+ mojo::embedder::ProcessType::NONE, io_thread_task_runner_, this,
+ io_thread_task_runner_, mojo::embedder::ScopedPlatformHandle());
}
}