summaryrefslogtreecommitdiff
path: root/chromium/content/browser/browser_process_sub_thread.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-08-28 15:28:34 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-08-28 13:54:51 +0000
commit2a19c63448c84c1805fb1a585c3651318bb86ca7 (patch)
treeeb17888e8531aa6ee5e85721bd553b832a7e5156 /chromium/content/browser/browser_process_sub_thread.cc
parentb014812705fc80bff0a5c120dfcef88f349816dc (diff)
downloadqtwebengine-chromium-2a19c63448c84c1805fb1a585c3651318bb86ca7.tar.gz
BASELINE: Update Chromium to 69.0.3497.70
Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser/browser_process_sub_thread.cc')
-rw-r--r--chromium/content/browser/browser_process_sub_thread.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/chromium/content/browser/browser_process_sub_thread.cc b/chromium/content/browser/browser_process_sub_thread.cc
index 6f33cee4d65..876318dc799 100644
--- a/chromium/content/browser/browser_process_sub_thread.cc
+++ b/chromium/content/browser/browser_process_sub_thread.cc
@@ -197,14 +197,7 @@ void BrowserProcessSubThread::IOThreadCleanUp() {
static_cast<UtilityProcessHost*>(it.GetDelegate());
if (utility_process->sandbox_type() ==
service_manager::SANDBOX_TYPE_NETWORK) {
- // Even though the TerminateAll call above tries to kill all child
- // processes, that will fail sometimes (e.g. on Windows if there's pending
- // I/O). Once the network service is sandboxed this will be taken care of,
- // since the sandbox ensures child processes are terminated. Until then,
- // wait on the network process for a bit. This is done so that:
- // 1) when Chrome quits, we ensure that cookies & cache are flushed
- // 2) tests aren't killed by swarming because of child processes that
- // outlive the parent process.
+ // This ensures that cookies and cache are flushed to disk on shutdown.
// https://crbug.com/841001
const int kMaxSecondsToWaitForNetworkProcess = 10;
ChildProcessHostImpl* child_process =