Simplify SequencedTaskRunner::{Delete,Releaose}Soon impl

base/sequenced_task_runner.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_SEQUENCED_TASK_RUNNER_H_
 #define BASE_SEQUENCED_TASK_RUNNER_H_
 
 #include "base/base_export.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/task_runner.h"
@@ skipping 104 matching lines @@
       const tracked_objects::Location& from_here,
       const Closure& task,
       base::TimeDelta delay) = 0;
 
   // Submits a non-nestable task to delete the given object.  Returns
   // true if the object may be deleted at some point in the future,
   // and false if the object definitely will not be deleted.
   template <class T>
   bool DeleteSoon(const tracked_objects::Location& from_here,
                   const T* object) {
-    return
-        subtle::DeleteHelperInternal<T, bool>::DeleteViaSequencedTaskRunner(
-            this, from_here, object);
+    return DeleteOrReleaseSoonInternal(from_here, &DeleteHelper<T>::DoDelete,
+                                       object);
   }
 
   // Submits a non-nestable task to release the given object.  Returns
   // true if the object may be released at some point in the future,
   // and false if the object definitely will not be released.
   template <class T>
   bool ReleaseSoon(const tracked_objects::Location& from_here,
-                   T* object) {
-    return
-        subtle::ReleaseHelperInternal<T, bool>::ReleaseViaSequencedTaskRunner(
-            this, from_here, object);
+                   const T* object) {
+    return DeleteOrReleaseSoonInternal(from_here, &ReleaseHelper<T>::DoRelease,
+                                       object);
   }
 
  protected:
   ~SequencedTaskRunner() override {}
 
  private:
-  template <class T, class R> friend class subtle::DeleteHelperInternal;
-  template <class T, class R> friend class subtle::ReleaseHelperInternal;
-
-  bool DeleteSoonInternal(const tracked_objects::Location& from_here,
-                          void(*deleter)(const void*),
-                          const void* object);
-
-  bool ReleaseSoonInternal(const tracked_objects::Location& from_here,
-                           void(*releaser)(const void*),
-                           const void* object);
+  bool DeleteOrReleaseSoonInternal(const tracked_objects::Location& from_here,
+                                   void (*deleter)(const void*),
+                                   const void* object);
 };
 
 struct BASE_EXPORT OnTaskRunnerDeleter {
   explicit OnTaskRunnerDeleter(scoped_refptr<SequencedTaskRunner> task_runner);
   ~OnTaskRunnerDeleter();
 
   OnTaskRunnerDeleter(OnTaskRunnerDeleter&&);
   OnTaskRunnerDeleter& operator=(OnTaskRunnerDeleter&&);
 
   template <typename T>
   void operator()(const T* ptr) {
     if (ptr)
       task_runner_->DeleteSoon(FROM_HERE, ptr);
   }
 
   scoped_refptr<SequencedTaskRunner> task_runner_;
 };
 
 }  // namespace base
 
 #endif  // BASE_SEQUENCED_TASK_RUNNER_H_