diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-11 11:32:04 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-18 13:40:17 +0000 |
| commit | 31ccca0778db85c159634478b4ec7997f6704860 (patch) | |
| tree | 3d33fc3afd9d5ec95541e1bbe074a9cf8da12a0e /chromium/content/browser/browser_process_sub_thread.cc | |
| parent | 248b70b82a40964d5594eb04feca0fa36716185d (diff) | |
| download | qtwebengine-chromium-31ccca0778db85c159634478b4ec7997f6704860.tar.gz | |
BASELINE: Update Chromium to 80.0.3987.136
Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'chromium/content/browser/browser_process_sub_thread.cc')
| -rw-r--r-- | chromium/content/browser/browser_process_sub_thread.cc | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/chromium/content/browser/browser_process_sub_thread.cc b/chromium/content/browser/browser_process_sub_thread.cc index 3c6e69942d2..550b8fce86e 100644 --- a/chromium/content/browser/browser_process_sub_thread.cc +++ b/chromium/content/browser/browser_process_sub_thread.cc @@ -17,7 +17,6 @@ #include "content/browser/utility_process_host.h" #include "content/common/child_process_host_impl.h" #include "content/public/browser/browser_child_process_host_iterator.h" -#include "content/public/browser/browser_thread_delegate.h" #include "content/public/common/process_type.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request.h" @@ -32,20 +31,6 @@ namespace content { -namespace { -BrowserThreadDelegate* g_io_thread_delegate = nullptr; -} // namespace - -// static -void BrowserThread::SetIOThreadDelegate(BrowserThreadDelegate* delegate) { - // |delegate| can only be set/unset while BrowserThread::IO isn't up. - DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::IO)); - // and it cannot be set twice. - DCHECK(!g_io_thread_delegate || !delegate); - - g_io_thread_delegate = delegate; -} - BrowserProcessSubThread::BrowserProcessSubThread(BrowserThread::ID identifier) : base::Thread(BrowserThreadImpl::GetThreadName(identifier)), identifier_(identifier) { @@ -122,9 +107,6 @@ void BrowserProcessSubThread::CleanUp() { if (BrowserThread::CurrentlyOn(BrowserThread::IO)) IOThreadCleanUp(); - if (identifier_ == BrowserThread::IO && g_io_thread_delegate) - g_io_thread_delegate->CleanUp(); - notification_service_.reset(); #if defined(OS_WIN) @@ -136,12 +118,6 @@ void BrowserProcessSubThread::CompleteInitializationOnBrowserThread() { DCHECK_CALLED_ON_VALID_THREAD(browser_thread_checker_); notification_service_ = std::make_unique<NotificationServiceImpl>(); - - if (identifier_ == BrowserThread::IO && g_io_thread_delegate) { - // Allow blocking calls while initializing the IO thread. - base::ScopedAllowBlocking allow_blocking_for_init; - g_io_thread_delegate->Init(); - } } // Mark following two functions as NOINLINE so the compiler doesn't merge |