diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-20 13:40:20 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-22 12:41:23 +0000 |
| commit | 7961cea6d1041e3e454dae6a1da660b453efd238 (patch) | |
| tree | c0eeb4a9ff9ba32986289c1653d9608e53ccb444 /chromium/content/browser/browser_main_loop_unittest.cc | |
| parent | b7034d0803538058e5c9d904ef03cf5eab34f6ef (diff) | |
| download | qtwebengine-chromium-7961cea6d1041e3e454dae6a1da660b453efd238.tar.gz | |
BASELINE: Update Chromium to 78.0.3904.130
Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser/browser_main_loop_unittest.cc')
| -rw-r--r-- | chromium/content/browser/browser_main_loop_unittest.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chromium/content/browser/browser_main_loop_unittest.cc b/chromium/content/browser/browser_main_loop_unittest.cc index f3ed33e4973..b26e641f772 100644 --- a/chromium/content/browser/browser_main_loop_unittest.cc +++ b/chromium/content/browser/browser_main_loop_unittest.cc @@ -8,7 +8,7 @@ #include "base/message_loop/message_loop.h" #include "base/system/sys_info.h" #include "base/task/post_task.h" -#include "base/task/thread_pool/thread_pool.h" +#include "base/task/thread_pool/thread_pool_instance.h" #include "base/test/mock_callback.h" #include "base/test/scoped_command_line.h" #include "content/browser/browser_thread_impl.h" @@ -72,7 +72,7 @@ TEST_F(BrowserMainLoopTest, CreateThreadsInSingleProcess) { browser_main_loop.CreateThreads(); EXPECT_GE(base::ThreadPoolInstance::Get() ->GetMaxConcurrentNonBlockedTasksWithTraitsDeprecated( - {base::TaskPriority::USER_VISIBLE}), + {base::ThreadPool(), base::TaskPriority::USER_VISIBLE}), base::SysInfo::NumberOfProcessors() - 1); browser_main_loop.ShutdownThreadsAndCleanUp(); } @@ -94,9 +94,8 @@ TEST_F(BrowserMainLoopTest, StrickMockTask task; // No task should run because IO thread has not been initialized yet. - base::PostTaskWithTraits(FROM_HERE, {BrowserThread::IO}, task.Get()); - base::CreateTaskRunnerWithTraits({BrowserThread::IO}) - ->PostTask(FROM_HERE, task.Get()); + base::PostTask(FROM_HERE, {BrowserThread::IO}, task.Get()); + base::CreateTaskRunner({BrowserThread::IO})->PostTask(FROM_HERE, task.Get()); content::RunAllPendingInMessageLoop(BrowserThread::IO); |