diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 11:40:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 12:42:11 +0000 |
| commit | 5d87695f37678f96492b258bbab36486c59866b4 (patch) | |
| tree | be9783bbaf04fb930c4d74ca9c00b5e7954c8bc6 /chromium/content/browser/browser_main_loop_unittest.cc | |
| parent | 6c11fb357ec39bf087b8b632e2b1e375aef1b38b (diff) | |
| download | qtwebengine-chromium-5d87695f37678f96492b258bbab36486c59866b4.tar.gz | |
BASELINE: Update Chromium to 75.0.3770.56
Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/content/browser/browser_main_loop_unittest.cc')
| -rw-r--r-- | chromium/content/browser/browser_main_loop_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chromium/content/browser/browser_main_loop_unittest.cc b/chromium/content/browser/browser_main_loop_unittest.cc index 9de8c766f06..66b7e9c8ee9 100644 --- a/chromium/content/browser/browser_main_loop_unittest.cc +++ b/chromium/content/browser/browser_main_loop_unittest.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/message_loop/message_loop.h" #include "base/system/sys_info.h" -#include "base/task/task_scheduler/task_scheduler.h" +#include "base/task/thread_pool/thread_pool.h" #include "base/test/scoped_command_line.h" #include "content/browser/browser_thread_impl.h" #include "content/browser/scheduler/browser_task_executor.h" @@ -26,18 +26,18 @@ TEST(BrowserMainLoopTest, CreateThreadsInSingleProcess) { base::test::ScopedCommandLine scoped_command_line; scoped_command_line.GetProcessCommandLine()->AppendSwitch( switches::kSingleProcess); - base::TaskScheduler::Create("Browser"); - StartBrowserTaskScheduler(); + base::ThreadPool::Create("Browser"); + StartBrowserThreadPool(); BrowserTaskExecutor::Create(); MainFunctionParams main_function_params( *scoped_command_line.GetProcessCommandLine()); BrowserMainLoop browser_main_loop( main_function_params, - std::make_unique<base::TaskScheduler::ScopedExecutionFence>()); + std::make_unique<base::ThreadPool::ScopedExecutionFence>()); browser_main_loop.MainMessageLoopStart(); browser_main_loop.Init(); browser_main_loop.CreateThreads(); - EXPECT_GE(base::TaskScheduler::GetInstance() + EXPECT_GE(base::ThreadPool::GetInstance() ->GetMaxConcurrentNonBlockedTasksWithTraitsDeprecated( {base::TaskPriority::USER_VISIBLE}), base::SysInfo::NumberOfProcessors() - 1); @@ -48,8 +48,8 @@ TEST(BrowserMainLoopTest, CreateThreadsInSingleProcess) { BrowserThreadImpl::ResetGlobalsForTesting( static_cast<BrowserThread::ID>(id)); } - base::TaskScheduler::GetInstance()->JoinForTesting(); - base::TaskScheduler::SetInstance(nullptr); + base::ThreadPool::GetInstance()->JoinForTesting(); + base::ThreadPool::SetInstance(nullptr); } } // namespace content |