summaryrefslogtreecommitdiff
path: root/chromium/content/browser/browser_process_sub_thread.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/browser/browser_process_sub_thread.cc')
-rw-r--r--chromium/content/browser/browser_process_sub_thread.cc4
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