diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-29 10:46:47 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-02 12:02:10 +0000 |
| commit | 99677208ff3b216fdfec551fbe548da5520cd6fb (patch) | |
| tree | 476a4865c10320249360e859d8fdd3e01833b03a /chromium/content/browser/browser_process_sub_thread.cc | |
| parent | c30a6232df03e1efbd9f3b226777b07e087a1122 (diff) | |
| download | qtwebengine-chromium-99677208ff3b216fdfec551fbe548da5520cd6fb.tar.gz | |
BASELINE: Update Chromium to 86.0.4240.124
Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644
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.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chromium/content/browser/browser_process_sub_thread.cc b/chromium/content/browser/browser_process_sub_thread.cc index 748e7cf0b5b..fce0b870da7 100644 --- a/chromium/content/browser/browser_process_sub_thread.cc +++ b/chromium/content/browser/browser_process_sub_thread.cc @@ -20,7 +20,6 @@ #include "content/public/browser/browser_child_process_host_iterator.h" #include "content/public/common/process_type.h" #include "net/url_request/url_fetcher.h" -#include "net/url_request/url_request.h" #if defined(OS_ANDROID) #include "base/android/jni_android.h" @@ -136,7 +135,7 @@ NOINLINE void BrowserProcessSubThread::IOThreadRun(base::RunLoop* run_loop) { // Register the IO thread for hang watching before it starts running and set // up a closure to automatically unregister it when Run() returns. base::ScopedClosureRunner unregister_thread_closure; - if (base::FeatureList::IsEnabled(base::HangWatcher::kEnableHangWatcher)) { + if (base::HangWatcher::IsIOThreadHangWatchingEnabled()) { unregister_thread_closure = base::HangWatcher::GetInstance()->RegisterThread(); } @@ -162,7 +161,7 @@ void BrowserProcessSubThread::IOThreadCleanUp() { UtilityProcessHost* utility_process = static_cast<UtilityProcessHost*>(it.GetDelegate()); if (utility_process->sandbox_type() == - service_manager::SandboxType::kNetwork) { + sandbox::policy::SandboxType::kNetwork) { // This ensures that cookies and cache are flushed to disk on shutdown. // https://crbug.com/841001 #if BUILDFLAG(CLANG_PROFILING) |