| Index: content/browser/cache_storage/cache_storage_scheduler.h
|
| diff --git a/content/browser/cache_storage/cache_storage_scheduler.h b/content/browser/cache_storage/cache_storage_scheduler.h
|
| index fdf668134c888f41a8449ef8b8f1654d4897faa2..85e173cbaa25afdca601d164e6f6163e9cd35d6f 100644
|
| --- a/content/browser/cache_storage/cache_storage_scheduler.h
|
| +++ b/content/browser/cache_storage/cache_storage_scheduler.h
|
| @@ -47,24 +47,16 @@ class CONTENT_EXPORT CacheStorageScheduler {
|
| template <typename... Args>
|
| base::OnceCallback<void(Args...)> WrapCallbackToRunNext(
|
| base::OnceCallback<void(Args...)> callback) {
|
| - return base::BindOnce(
|
| - &CacheStorageScheduler::RunNextOnceContinuation<Args...>,
|
| - weak_ptr_factory_.GetWeakPtr(), std::move(callback));
|
| - }
|
| - template <typename... Args>
|
| - base::RepeatingCallback<void(Args...)> WrapCallbackToRunNext(
|
| - const base::RepeatingCallback<void(Args...)>& callback) {
|
| - return base::BindRepeating(
|
| - &CacheStorageScheduler::RunNextRepeatingContinuation<Args...>,
|
| - weak_ptr_factory_.GetWeakPtr(), callback);
|
| + return base::BindOnce(&CacheStorageScheduler::RunNextContinuation<Args...>,
|
| + weak_ptr_factory_.GetWeakPtr(), std::move(callback));
|
| }
|
|
|
| private:
|
| void RunOperationIfIdle();
|
|
|
| template <typename... Args>
|
| - void RunNextOnceContinuation(base::OnceCallback<void(Args...)> callback,
|
| - Args... args) {
|
| + void RunNextContinuation(base::OnceCallback<void(Args...)> callback,
|
| + Args... args) {
|
| // Grab a weak ptr to guard against the scheduler being deleted during the
|
| // callback.
|
| base::WeakPtr<CacheStorageScheduler> scheduler =
|
| @@ -74,19 +66,6 @@ class CONTENT_EXPORT CacheStorageScheduler {
|
| if (scheduler)
|
| CompleteOperationAndRunNext();
|
| }
|
| - template <typename... Args>
|
| - void RunNextRepeatingContinuation(
|
| - const base::RepeatingCallback<void(Args...)>& callback,
|
| - Args... args) {
|
| - // Grab a weak ptr to guard against the scheduler being deleted during the
|
| - // callback.
|
| - base::WeakPtr<CacheStorageScheduler> scheduler =
|
| - weak_ptr_factory_.GetWeakPtr();
|
| -
|
| - callback.Run(std::forward<Args>(args)...);
|
| - if (scheduler)
|
| - CompleteOperationAndRunNext();
|
| - }
|
|
|
| std::list<std::unique_ptr<CacheStorageOperation>> pending_operations_;
|
| std::unique_ptr<CacheStorageOperation> running_operation_;
|
|
|