diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 10:33:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:45:12 +0000 |
| commit | be59a35641616a4cf23c4a13fa0632624b021c1b (patch) | |
| tree | 9da183258bdf9cc413f7562079d25ace6955467f /chromium/content/browser/browser_main_loop_unittest.cc | |
| parent | d702e4b6a64574e97fc7df8fe3238cde70242080 (diff) | |
| download | qtwebengine-chromium-be59a35641616a4cf23c4a13fa0632624b021c1b.tar.gz | |
BASELINE: Update Chromium to 62.0.3202.101
Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/content/browser/browser_main_loop_unittest.cc b/chromium/content/browser/browser_main_loop_unittest.cc index 3e2f04f04ec..76fab428647 100644 --- a/chromium/content/browser/browser_main_loop_unittest.cc +++ b/chromium/content/browser/browser_main_loop_unittest.cc @@ -29,11 +29,15 @@ TEST(BrowserMainLoopTest, CreateThreadsInSingleProcess) { browser_main_loop.MainMessageLoopStart(); browser_main_loop.CreateThreads(); EXPECT_GE(base::TaskScheduler::GetInstance() - ->GetMaxConcurrentTasksWithTraitsDeprecated( + ->GetMaxConcurrentNonBlockedTasksWithTraitsDeprecated( {base::TaskPriority::USER_VISIBLE}), base::SysInfo::NumberOfProcessors()); browser_main_loop.ShutdownThreadsAndCleanUp(); } + for (int id = BrowserThread::UI; id < BrowserThread::ID_COUNT; ++id) { + BrowserThreadImpl::ResetGlobalsForTesting( + static_cast<BrowserThread::ID>(id)); + } base::TaskScheduler::GetInstance()->JoinForTesting(); base::TaskScheduler::SetInstance(nullptr); } |