diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-16 09:59:13 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-20 10:28:53 +0000 |
| commit | 6c11fb357ec39bf087b8b632e2b1e375aef1b38b (patch) | |
| tree | c8315530db18a8ee566521c39ab8a6af4f72bc03 /chromium/content/browser/browser_process_sub_thread.cc | |
| parent | 3ffaed019d0772e59d6cdb2d0d32fe4834c31f72 (diff) | |
| download | qtwebengine-chromium-6c11fb357ec39bf087b8b632e2b1e375aef1b38b.tar.gz | |
BASELINE: Update Chromium to 74.0.3729.159
Change-Id: I8d2497da544c275415aedd94dd25328d555de811
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/content/browser/browser_process_sub_thread.cc')
| -rw-r--r-- | chromium/content/browser/browser_process_sub_thread.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chromium/content/browser/browser_process_sub_thread.cc b/chromium/content/browser/browser_process_sub_thread.cc index 074fbfa8098..ed57071a15f 100644 --- a/chromium/content/browser/browser_process_sub_thread.cc +++ b/chromium/content/browser/browser_process_sub_thread.cc @@ -4,6 +4,8 @@ #include "content/browser/browser_process_sub_thread.h" +#include "base/bind.h" +#include "base/clang_coverage_buildflags.h" #include "base/compiler_specific.h" #include "base/debug/alias.h" #include "base/metrics/histogram_macros.h" @@ -80,7 +82,7 @@ BrowserProcessSubThread::CreateIOThread() { TRACE_EVENT0("startup", "BrowserProcessSubThread::CreateIOThread"); base::Thread::Options options; options.message_loop_type = base::MessageLoop::TYPE_IO; -#if defined(OS_ANDROID) || defined(OS_CHROMEOS) +#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE) // Up the priority of the |io_thread_| as some of its IPCs relate to // display tasks. options.priority = base::ThreadPriority::DISPLAY; @@ -192,7 +194,13 @@ void BrowserProcessSubThread::IOThreadCleanUp() { service_manager::SANDBOX_TYPE_NETWORK) { // This ensures that cookies and cache are flushed to disk on shutdown. // https://crbug.com/841001 +#if BUILDFLAG(CLANG_COVERAGE) + // On coverage build, browser_tests runs 10x slower. + const int kMaxSecondsToWaitForNetworkProcess = 100; +#else const int kMaxSecondsToWaitForNetworkProcess = 10; +#endif + ChildProcessHostImpl* child_process = static_cast<ChildProcessHostImpl*>(it.GetHost()); auto& process = child_process->peer_process(); |