1 files changed, 9 insertions, 9 deletions

diff --git a/src/mongo/db/repl/collection_cloner_test.cpp b/src/mongo/db/repl/collection_cloner_test.cpp
index aabb5619894..949d419c746 100644
--- a/src/mongo/db/repl/collection_cloner_test.cpp
+++ b/src/mongo/db/repl/collection_cloner_test.cpp
@@ -65,7 +65,7 @@ public:
         : MockDBClientConnection(remote), _net(net) {}
 
     virtual ~FailableMockDBClientConnection() {
-        stdx::unique_lock<stdx::mutex> lk(_mutex);
+        stdx::unique_lock<Latch> lk(_mutex);
         _paused = false;
         _cond.notify_all();
         _cond.wait(lk, [this] { return !_resuming; });
@@ -86,13 +86,13 @@ public:
                              int batchSize) override {
         ON_BLOCK_EXIT([this]() {
             {
-                stdx::lock_guard<stdx::mutex> lk(_mutex);
+                stdx::lock_guard<Latch> lk(_mutex);
                 _queryCount++;
             }
             _cond.notify_all();
         });
         {
-            stdx::unique_lock<stdx::mutex> lk(_mutex);
+            stdx::unique_lock<Latch> lk(_mutex);
             _waiting = _paused;
             _cond.notify_all();
             while (_paused) {
@@ -118,14 +118,14 @@ public:
 
     void pause() {
         {
-            stdx::lock_guard<stdx::mutex> lk(_mutex);
+            stdx::lock_guard<Latch> lk(_mutex);
             _paused = true;
         }
         _cond.notify_all();
     }
     void resume() {
         {
-            stdx::unique_lock<stdx::mutex> lk(_mutex);
+            stdx::unique_lock<Latch> lk(_mutex);
             _resuming = true;
             _resume(&lk);
             _resuming = false;
@@ -135,13 +135,13 @@ public:
 
     // Waits for the next query after pause() is called to start.
     void waitForPausedQuery() {
-        stdx::unique_lock<stdx::mutex> lk(_mutex);
+        stdx::unique_lock<Latch> lk(_mutex);
         _cond.wait(lk, [this] { return _waiting; });
     }
 
     // Resumes, then waits for the next query to run after resume() is called to complete.
     void resumeAndWaitForResumedQuery() {
-        stdx::unique_lock<stdx::mutex> lk(_mutex);
+        stdx::unique_lock<Latch> lk(_mutex);
         _resuming = true;
         _resume(&lk);
         _cond.notify_all();  // This is to wake up the paused thread.
@@ -152,7 +152,7 @@ public:
 
 private:
     executor::NetworkInterfaceMock* _net;
-    stdx::mutex _mutex;
+    Mutex _mutex = MONGO_MAKE_LATCH("FailableMockDBClientConnection::_mutex");
     stdx::condition_variable _cond;
     bool _paused = false;
     bool _waiting = false;
@@ -162,7 +162,7 @@ private:
     Status _failureForConnect = Status::OK();
     Status _failureForQuery = Status::OK();
 
-    void _resume(stdx::unique_lock<stdx::mutex>* lk) {
+    void _resume(stdx::unique_lock<Latch>* lk) {
         invariant(lk->owns_lock());
         _paused = false;
         _resumedQueryCount = _queryCount;