1 files changed, 10 insertions, 10 deletions

diff --git a/src/mongo/util/concurrency/thread_pool_test.cpp b/src/mongo/util/concurrency/thread_pool_test.cpp
index 1d85b8b95df..5812a860eab 100644
--- a/src/mongo/util/concurrency/thread_pool_test.cpp
+++ b/src/mongo/util/concurrency/thread_pool_test.cpp
@@ -34,8 +34,8 @@
 #include <boost/optional.hpp>
 
 #include "mongo/base/init.h"
-#include "mongo/stdx/condition_variable.h"
-#include "mongo/stdx/mutex.h"
+#include "mongo/platform/condition_variable.h"
+#include "mongo/platform/mutex.h"
 #include "mongo/stdx/thread.h"
 #include "mongo/unittest/barrier.h"
 #include "mongo/unittest/death_test.h"
@@ -70,7 +70,7 @@ protected:
     }
 
     void blockingWork() {
-        stdx::unique_lock<stdx::mutex> lk(mutex);
+        stdx::unique_lock<Latch> lk(mutex);
         ++count1;
         cv1.notify_all();
         while (!flag2) {
@@ -78,7 +78,7 @@ protected:
         }
     }
 
-    stdx::mutex mutex;
+    Mutex mutex = MONGO_MAKE_LATCH("ThreadPoolTest::mutex");
     stdx::condition_variable cv1;
     stdx::condition_variable cv2;
     size_t count1 = 0U;
@@ -86,7 +86,7 @@ protected:
 
 private:
     void tearDown() override {
-        stdx::unique_lock<stdx::mutex> lk(mutex);
+        stdx::unique_lock<Latch> lk(mutex);
         flag2 = true;
         cv2.notify_all();
         lk.unlock();
@@ -103,7 +103,7 @@ TEST_F(ThreadPoolTest, MinPoolSize0) {
     auto& pool = makePool(options);
     pool.startup();
     ASSERT_EQ(0U, pool.getStats().numThreads);
-    stdx::unique_lock<stdx::mutex> lk(mutex);
+    stdx::unique_lock<Latch> lk(mutex);
     pool.schedule([this](auto status) {
         ASSERT_OK(status);
         blockingWork();
@@ -155,7 +155,7 @@ TEST_F(ThreadPoolTest, MaxPoolSize20MinPoolSize15) {
     options.maxIdleThreadAge = Milliseconds(100);
     auto& pool = makePool(options);
     pool.startup();
-    stdx::unique_lock<stdx::mutex> lk(mutex);
+    stdx::unique_lock<Latch> lk(mutex);
     for (size_t i = 0U; i < 30U; ++i) {
         pool.schedule([this, i](auto status) {
             ASSERT_OK(status) << i;
@@ -223,7 +223,7 @@ DEATH_TEST(ThreadPoolTest,
     // mutex-lock is blocked waiting for the mutex, so the independent thread must be blocked inside
     // of join(), until the pool thread finishes. At this point, if we destroy the pool, its
     // destructor should trigger a fatal error due to double-join.
-    stdx::mutex mutex;
+    auto mutex = MONGO_MAKE_LATCH();
     ThreadPool::Options options;
     options.minThreads = 2;
     options.poolName = "DoubleJoinPool";
@@ -233,10 +233,10 @@ DEATH_TEST(ThreadPoolTest,
     while (pool->getStats().numThreads < 2U) {
         sleepmillis(50);
     }
-    stdx::unique_lock<stdx::mutex> lk(mutex);
+    stdx::unique_lock<Latch> lk(mutex);
     pool->schedule([&mutex](auto status) {
         ASSERT_OK(status);
-        stdx::lock_guard<stdx::mutex> lk(mutex);
+        stdx::lock_guard<Latch> lk(mutex);
     });
     stdx::thread t([&pool] {
         pool->shutdown();