Revert "SERVER-29893 Rename recovery code and make it accessible to both startup and rollback"

This reverts commit 8fa770baf8fac6e71a45f84b48eeb3bae96a8dab.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/mongo/s/sharding_mongod_test_fixture.cpp b/src/mongo/s/sharding_mongod_test_fixture.cpp
index 453951a1735..3a9fa023b2a 100644
--- a/src/mongo/s/sharding_mongod_test_fixture.cpp
+++ b/src/mongo/s/sharding_mongod_test_fixture.cpp
@@ -51,7 +51,6 @@
 #include "mongo/db/repl/replication_coordinator.h"
 #include "mongo/db/repl/replication_coordinator_mock.h"
 #include "mongo/db/repl/replication_process.h"
-#include "mongo/db/repl/replication_recovery_mock.h"
 #include "mongo/db/repl/storage_interface_mock.h"
 #include "mongo/db/service_context_noop.h"
 #include "mongo/executor/network_interface_mock.h"
@@ -131,11 +130,10 @@ void ShardingMongodTestFixture::setUp() {
     repl::DropPendingCollectionReaper::set(
         service, stdx::make_unique<repl::DropPendingCollectionReaper>(storagePtr.get()));
 
-    repl::ReplicationProcess::set(service,
-                                  stdx::make_unique<repl::ReplicationProcess>(
-                                      storagePtr.get(),
-                                      stdx::make_unique<repl::ReplicationConsistencyMarkersMock>(),
-                                      stdx::make_unique<repl::ReplicationRecoveryMock>()));
+    repl::ReplicationProcess::set(
+        service,
+        stdx::make_unique<repl::ReplicationProcess>(
+            storagePtr.get(), stdx::make_unique<repl::ReplicationConsistencyMarkersMock>()));
     repl::ReplicationProcess::get(_opCtx.get())
         ->initializeRollbackID(_opCtx.get())
         .transitional_ignore();