SERVER-23103 Remove the ntservice mock

1 files changed, 2 insertions, 4 deletions

diff --git a/src/mongo/util/ntservice.cpp b/src/mongo/util/ntservice.cpp
index 81ff20e3e17..8044d26790d 100644
--- a/src/mongo/util/ntservice.cpp
+++ b/src/mongo/util/ntservice.cpp
@@ -37,8 +37,6 @@
 
 #include "mongo/util/ntservice.h"
 
-#include "mongo/db/client.h"
-#include "mongo/db/instance.h"
 #include "mongo/stdx/chrono.h"
 #include "mongo/stdx/future.h"
 #include "mongo/stdx/thread.h"
@@ -533,7 +531,7 @@ const int kStopWaitHintMillis = 30000;
 static void serviceStop() {
     // VS2013 Doesn't support future<void>, so fake it with a bool.
     stdx::packaged_task<bool()> exitCleanlyTask([] {
-        Client::initThread("serviceStopWorker");
+        setThreadName("serviceStopWorker");
         // Stop the process
         // TODO: SERVER-5703, separate the "cleanup for shutdown" functionality from
         // the "terminate process" functionality in exitCleanly.
@@ -574,7 +572,7 @@ static void WINAPI initService(DWORD argc, LPTSTR* argv) {
 }
 
 static void serviceShutdown(const char* controlCodeName) {
-    Client::initThread("serviceShutdown");
+    setThreadName("serviceShutdown");
 
     log() << "got " << controlCodeName << " request from Windows Service Control Manager, "
           << (inShutdown() ? "already in shutdown" : "will terminate after current cmd ends");