diff options
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) |