[BackgroundSyncManager] Clean up some extra functions with variadic templates

This CL removes some redundant functions via variadic templates. Note that it also removes an unnecessary weak ptr check since the BackgroundSyncManager will not be deleted by the callback as suggested by the comment (it's owned by the StoragePartition).

Downstream of https://crrev.com/1119783003

BUG=

Review URL: https://codereview.chromium.org/1116293003

Cr-Commit-Position: refs/heads/master@{#328773}

1 files changed, 5 insertions, 13 deletions

diff --git a/content/browser/background_sync/background_sync_manager.h b/content/browser/background_sync/background_sync_manager.h
index 171b02f..f9c8960 100644
--- a/content/browser/background_sync/background_sync_manager.h
+++ b/content/browser/background_sync/background_sync_manager.h
@@ -288,25 +288,17 @@ class CONTENT_EXPORT BackgroundSyncManager
 
   void OnNetworkChanged();
 
-  // Operation Scheduling callbacks
-  void PendingStatusAndRegistrationCallback(
-      const StatusAndRegistrationCallback& callback,
-      ErrorType error,
-      const BackgroundSyncRegistration& sync_registration);
-  void PendingStatusAndRegistrationsCallback(
-      const StatusAndRegistrationsCallback& callback,
-      ErrorType error,
-      const std::vector<BackgroundSyncRegistration>& sync_registrations);
-  void PendingStatusCallback(const StatusCallback& callback, ErrorType error);
-  void PendingClosure(const base::Closure& closure);
-
+  // Operation Scheduling callback and convenience functions.
+  template <typename CallbackT, typename... Params>
+  void CompleteOperationCallback(const CallbackT& callback,
+                                 Params... parameters);
+  base::Closure MakeEmptyCompletion();
   StatusAndRegistrationCallback MakeStatusAndRegistrationCompletion(
       const StatusAndRegistrationCallback& callback);
   StatusAndRegistrationsCallback MakeStatusAndRegistrationsCompletion(
       const StatusAndRegistrationsCallback& callback);
   BackgroundSyncManager::StatusCallback MakeStatusCompletion(
       const StatusCallback& callback);
-  base::Closure MakeEmptyCompletion();
 
   SWIdToRegistrationsMap sw_to_registrations_map_;
   CacheStorageScheduler op_scheduler_;