Fix BrowserProcessImpl::EndSession() for freon-enabled environment
BUG=472981
Review URL: https://codereview.chromium.org/1079093002
Cr-Commit-Position: refs/heads/master@{#324999}
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index b373810..254d2ef 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -152,7 +152,7 @@
static const int kUpdateCheckIntervalHours = 6;
#endif
-#if defined(USE_X11) || defined(OS_WIN)
+#if defined(USE_X11) || defined(OS_WIN) || defined(USE_OZONE)
// How long to wait for the File thread to complete during EndSession, on Linux
// and Windows. We have a timeout here because we're unable to run the UI
// messageloop and there's some deadlock risk. Our only option is to exit
@@ -498,7 +498,7 @@
//
// If you change the condition here, be sure to also change
// ProfileBrowserTests to match.
-#if defined(USE_X11) || defined(OS_WIN)
+#if defined(USE_X11) || defined(OS_WIN) || defined(USE_OZONE)
// Do a best-effort wait on the successful countdown of rundown tasks. Note
// that if we don't complete "quickly enough", Windows will terminate our
// process.
