summaryrefslogtreecommitdiffstats
path: root/content/common/child_process.cc
diff options
context:
space:
mode:
Diffstat (limited to 'content/common/child_process.cc')
-rw-r--r--content/common/child_process.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/content/common/child_process.cc b/content/common/child_process.cc
index c66e4a4..6bfff5c 100644
--- a/content/common/child_process.cc
+++ b/content/common/child_process.cc
@@ -71,7 +71,10 @@ ChildProcess::~ChildProcess() {
// Kill the main thread object before nulling child_process_, since
// destruction code might depend on it.
- main_thread_.reset();
+ if (main_thread_) { // null in unittests.
+ main_thread_->Shutdown();
+ main_thread_.reset();
+ }
child_process_ = NULL;
}