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);
 }