summaryrefslogtreecommitdiffstats
path: root/chrome/browser/io_thread.cc
diff options
context:
space:
mode:
authormichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-21 23:05:27 +0000
committermichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-21 23:05:27 +0000
commit325a71ffd6569bc84cd2d0f2586dac2f3e9fe95a (patch)
tree09f310135f18917f2c2aafcdc19b5a6570d82205 /chrome/browser/io_thread.cc
parent0abc3c589cfcffd655867ef4ceb9db3c225da064 (diff)
downloadchromium_src-325a71ffd6569bc84cd2d0f2586dac2f3e9fe95a.zip
chromium_src-325a71ffd6569bc84cd2d0f2586dac2f3e9fe95a.tar.gz
chromium_src-325a71ffd6569bc84cd2d0f2586dac2f3e9fe95a.tar.bz2
Kill all child processes at IO thread shutdown time.
BUG=none TEST=wrapper-map-gc.html leaks a WorkerProcessHost which this cleanup logic takes care of Review URL: http://codereview.chromium.org/2063015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/io_thread.cc')
-rw-r--r--chrome/browser/io_thread.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index ca5151b..0382ec4d 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -146,6 +146,11 @@ void IOThread::Init() {
}
void IOThread::CleanUp() {
+ // If any child processes are still running, terminate them and
+ // and delete the ChildProcessHost instances to release whatever
+ // IO thread only resources they are referencing.
+ ChildProcessHost::TerminateAll();
+
// Not initialized in Init(). May not be initialized.
if (dns_master_) {
DCHECK(prefetch_observer_);