SERVER-35682 kill existing SharedPromise type

This required plumbing unique_function into many more places.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/mongo/db/repl/database_cloner.h b/src/mongo/db/repl/database_cloner.h
index 0a5b893b294..7b2cd152592 100644
--- a/src/mongo/db/repl/database_cloner.h
+++ b/src/mongo/db/repl/database_cloner.h
@@ -97,6 +97,9 @@ public:
      */
     using StartCollectionClonerFn = stdx::function<Status(CollectionCloner&)>;
 
+    using ScheduleDbWorkFn = stdx::function<StatusWith<executor::TaskExecutor::CallbackHandle>(
+        executor::TaskExecutor::CallbackFn)>;
+
     /**
      * Creates DatabaseCloner task in inactive state. Use start() to activate cloner.
      *
@@ -116,7 +119,7 @@ public:
                    const ListCollectionsPredicateFn& listCollectionsPredicate,
                    StorageInterface* storageInterface,
                    const CollectionCallbackFn& collectionWork,
-                   const CallbackFn& onCompletion);
+                   CallbackFn onCompletion);
 
     virtual ~DatabaseCloner();
 
@@ -146,7 +149,7 @@ public:
      *
      * For testing only.
      */
-    void setScheduleDbWorkFn_forTest(const CollectionCloner::ScheduleDbWorkFn& scheduleDbWorkFn);
+    void setScheduleDbWorkFn_forTest(const ScheduleDbWorkFn& scheduleDbWorkFn);
 
     /**
      * Overrides how executor starts a collection cloner.
@@ -234,7 +237,7 @@ private:
     std::vector<NamespaceString> _collectionNamespaces;                  // (M)
     std::list<CollectionCloner> _collectionCloners;                      // (M)
     std::list<CollectionCloner>::iterator _currentCollectionClonerIter;  // (M)
-    CollectionCloner::ScheduleDbWorkFn
+    ScheduleDbWorkFn
         _scheduleDbWorkFn;  // (RT) Function for scheduling database work using the executor.
     StartCollectionClonerFn _startCollectionCloner;  // (RT)
     Stats _stats;                                    // (M) Stats about what this instance did.