summaryrefslogtreecommitdiffstats
path: root/chromium/base/task/thread_pool/service_thread_unittest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-31 15:50:41 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-08-30 12:35:23 +0000
commit7b2ffa587235a47d4094787d72f38102089f402a (patch)
tree30e82af9cbab08a7fa028bb18f4f2987a3f74dfa /chromium/base/task/thread_pool/service_thread_unittest.cc
parentd94af01c90575348c4e81a418257f254b6f8d225 (diff)
BASELINE: Update Chromium to 76.0.3809.94
Change-Id: I321c3f5f929c105aec0f98c5091ef6108822e647 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/base/task/thread_pool/service_thread_unittest.cc')
-rw-r--r--chromium/base/task/thread_pool/service_thread_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/base/task/thread_pool/service_thread_unittest.cc b/chromium/base/task/thread_pool/service_thread_unittest.cc
index be5a09d2d1c..9bfb845358b 100644
--- a/chromium/base/task/thread_pool/service_thread_unittest.cc
+++ b/chromium/base/task/thread_pool/service_thread_unittest.cc
@@ -28,7 +28,7 @@ void VerifyHasStringOnStack(const std::string& query) {
SCOPED_TRACE(stack);
const bool found_on_stack = stack.find(query) != std::string::npos;
const bool stack_has_symbols =
- stack.find("SchedulerWorker") != std::string::npos;
+ stack.find("WorkerThread") != std::string::npos;
EXPECT_TRUE(found_on_stack || !stack_has_symbols) << query;
}
@@ -58,8 +58,8 @@ TEST(ThreadPoolServiceThreadTest, MAYBE_StackHasIdentifyingFrame) {
TEST(ThreadPoolServiceThreadIntegrationTest, HeartbeatLatencyReport) {
ServiceThread::SetHeartbeatIntervalForTesting(TimeDelta::FromMilliseconds(1));
- ThreadPool::SetInstance(std::make_unique<internal::ThreadPoolImpl>("Test"));
- ThreadPool::GetInstance()->StartWithDefaultParams();
+ ThreadPoolInstance::Set(std::make_unique<internal::ThreadPoolImpl>("Test"));
+ ThreadPoolInstance::Get()->StartWithDefaultParams();
static constexpr const char* kExpectedMetrics[] = {
"ThreadPool.HeartbeatLatencyMicroseconds.Test."
@@ -92,8 +92,8 @@ TEST(ThreadPoolServiceThreadIntegrationTest, HeartbeatLatencyReport) {
}
}
- ThreadPool::GetInstance()->JoinForTesting();
- ThreadPool::SetInstance(nullptr);
+ ThreadPoolInstance::Get()->JoinForTesting();
+ ThreadPoolInstance::Set(nullptr);
ServiceThread::SetHeartbeatIntervalForTesting(TimeDelta());
}