diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 11:40:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 12:42:11 +0000 |
| commit | 5d87695f37678f96492b258bbab36486c59866b4 (patch) | |
| tree | be9783bbaf04fb930c4d74ca9c00b5e7954c8bc6 /chromium/content/browser/browser_process_sub_thread.cc | |
| parent | 6c11fb357ec39bf087b8b632e2b1e375aef1b38b (diff) | |
| download | qtwebengine-chromium-5d87695f37678f96492b258bbab36486c59866b4.tar.gz | |
BASELINE: Update Chromium to 75.0.3770.56
Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/content/browser/browser_process_sub_thread.cc')
| -rw-r--r-- | chromium/content/browser/browser_process_sub_thread.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chromium/content/browser/browser_process_sub_thread.cc b/chromium/content/browser/browser_process_sub_thread.cc index ed57071a15f..3e4873e4baf 100644 --- a/chromium/content/browser/browser_process_sub_thread.cc +++ b/chromium/content/browser/browser_process_sub_thread.cc @@ -197,6 +197,10 @@ void BrowserProcessSubThread::IOThreadCleanUp() { #if BUILDFLAG(CLANG_COVERAGE) // On coverage build, browser_tests runs 10x slower. const int kMaxSecondsToWaitForNetworkProcess = 100; +#elif defined(OS_CHROMEOS) + // ChromeOS will kill the browser process if it doesn't shut down within + // 3 seconds, so make sure we wait for less than that. + const int kMaxSecondsToWaitForNetworkProcess = 1; #else const int kMaxSecondsToWaitForNetworkProcess = 10; #endif |