Commit 8dea4773 authored by Ken Rockot's avatar Ken Rockot Committed by Commit Bot

Fix thread DCHECK in child process ServiceManagerConnection

|child_binding_| was introduced by r461826 to be bound on the IO
thread. This CL ensures that it's also unbound on the same thread
during shutdown; otherwise there's a race and it might get
incorrectly unbound on the main thread, leading to a DCHECK in
developer builds.

BUG=716416
TBR=ben@chromium.org

Change-Id: I194d1446753d3fb976b21bb191e7a407e7f8c6e7
Reviewed-on: https://chromium-review.googlesource.com/491886Reviewed-by: default avatarKen Rockot <rockot@chromium.org>
Commit-Queue: Ken Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#468405}
parent 2472d2fe
...@@ -207,6 +207,7 @@ class ServiceManagerConnectionImpl::IOThreadContext ...@@ -207,6 +207,7 @@ class ServiceManagerConnectionImpl::IOThreadContext
request_handlers_.clear(); request_handlers_.clear();
embedded_services_.clear(); embedded_services_.clear();
child_binding_.Close();
} }
void ClearConnectionFiltersOnIOThread() { void ClearConnectionFiltersOnIOThread() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment