[102] Quota: Use BindPostTask in QuotaManagerProxy
This change updates QuotaManagerProxy to use
base::BindPostTask to ensure callbacks are run or
destroyed on the specified task runner. The main difference
between the existing logic is that if the callback
is never run, it may not be destroyed on the correct task
runner. base::BindPostTask makes sure this doesn't happen.
Bug: 1324864
Change-Id: I5bc27b26458e454f50709ddc5f9d71d2e9f6a3f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3648495
Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
Commit-Queue: Ayu Ishii <ayui@chromium.org>
Cr-Commit-Position: refs/branch-heads/5005@{#813}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
diff --git a/storage/browser/quota/quota_manager_proxy.cc b/storage/browser/quota/quota_manager_proxy.cc
index c4c37ec1..0c30182c 100644
--- a/storage/browser/quota/quota_manager_proxy.cc
+++ b/storage/browser/quota/quota_manager_proxy.cc
@@ -17,6 +17,7 @@
#include "base/sequence_checker.h"
#include "base/strings/string_number_conversions.h"
#include "base/synchronization/waitable_event.h"
+#include "base/task/bind_post_task.h"
#include "base/task/sequenced_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
@@ -34,39 +35,6 @@
namespace storage {
-namespace {
-
-void DidGetBucket(scoped_refptr<base::SequencedTaskRunner> callback_task_runner,
- base::OnceCallback<void(QuotaErrorOr<BucketInfo>)> callback,
- QuotaErrorOr<BucketInfo> result) {
- DCHECK(callback_task_runner);
- DCHECK(callback);
-
- if (callback_task_runner->RunsTasksInCurrentSequence()) {
- std::move(callback).Run(std::move(result));
- return;
- }
- callback_task_runner->PostTask(
- FROM_HERE, base::BindOnce(std::move(callback), std::move(result)));
-}
-
-void DidGetStatus(
- scoped_refptr<base::SequencedTaskRunner> callback_task_runner,
- base::OnceCallback<void(blink::mojom::QuotaStatusCode)> callback,
- blink::mojom::QuotaStatusCode status) {
- DCHECK(callback_task_runner);
- DCHECK(callback);
-
- if (callback_task_runner->RunsTasksInCurrentSequence()) {
- std::move(callback).Run(std::move(status));
- return;
- }
- callback_task_runner->PostTask(
- FROM_HERE, base::BindOnce(std::move(callback), std::move(status)));
-}
-
-} // namespace
-
QuotaManagerProxy::QuotaManagerProxy(
QuotaManagerImpl* quota_manager_impl,
scoped_refptr<base::SequencedTaskRunner> quota_manager_impl_task_runner,
@@ -158,16 +126,16 @@
}
DCHECK_CALLED_ON_VALID_SEQUENCE(quota_manager_impl_sequence_checker_);
+
+ auto respond =
+ base::BindPostTask(std::move(callback_task_runner), std::move(callback));
if (!quota_manager_impl_) {
- DidGetBucket(std::move(callback_task_runner), std::move(callback),
- QuotaErrorOr<BucketInfo>(QuotaError::kUnknownError));
+ std::move(respond).Run(QuotaError::kUnknownError);
return;
}
- quota_manager_impl_->GetOrCreateBucket(
- storage_key, bucket_name,
- base::BindOnce(&DidGetBucket, std::move(callback_task_runner),
- std::move(callback)));
+ quota_manager_impl_->GetOrCreateBucket(storage_key, bucket_name,
+ std::move(respond));
}
QuotaErrorOr<BucketInfo> QuotaManagerProxy::GetOrCreateBucketSync(
@@ -211,16 +179,16 @@
}
DCHECK_CALLED_ON_VALID_SEQUENCE(quota_manager_impl_sequence_checker_);
+
+ auto respond =
+ base::BindPostTask(std::move(callback_task_runner), std::move(callback));
if (!quota_manager_impl_) {
- DidGetBucket(std::move(callback_task_runner), std::move(callback),
- QuotaErrorOr<BucketInfo>(QuotaError::kUnknownError));
+ std::move(respond).Run(QuotaError::kUnknownError);
return;
}
quota_manager_impl_->GetOrCreateBucketDeprecated(
- storage_key, bucket_name, storage_type,
- base::BindOnce(&DidGetBucket, std::move(callback_task_runner),
- std::move(callback)));
+ storage_key, bucket_name, storage_type, std::move(respond));
}
void QuotaManagerProxy::CreateBucketForTesting(
@@ -242,16 +210,16 @@
}
DCHECK_CALLED_ON_VALID_SEQUENCE(quota_manager_impl_sequence_checker_);
+
+ auto respond =
+ base::BindPostTask(std::move(callback_task_runner), std::move(callback));
if (!quota_manager_impl_) {
- DidGetBucket(std::move(callback_task_runner), std::move(callback),
- QuotaErrorOr<BucketInfo>(QuotaError::kUnknownError));
+ std::move(respond).Run(QuotaError::kUnknownError);
return;
}
quota_manager_impl_->CreateBucketForTesting( // IN-TEST
- storage_key, bucket_name, storage_type,
- base::BindOnce(&DidGetBucket, std::move(callback_task_runner),
- std::move(callback)));
+ storage_key, bucket_name, storage_type, std::move(respond));
}
void QuotaManagerProxy::GetBucket(
@@ -273,16 +241,16 @@
}
DCHECK_CALLED_ON_VALID_SEQUENCE(quota_manager_impl_sequence_checker_);
+
+ auto respond =
+ base::BindPostTask(std::move(callback_task_runner), std::move(callback));
if (!quota_manager_impl_) {
- DidGetBucket(std::move(callback_task_runner), std::move(callback),
- QuotaErrorOr<BucketInfo>(QuotaError::kUnknownError));
+ std::move(respond).Run(QuotaError::kUnknownError);
return;
}
- quota_manager_impl_->GetBucket(
- storage_key, bucket_name, type,
- base::BindOnce(&DidGetBucket, std::move(callback_task_runner),
- std::move(callback)));
+ quota_manager_impl_->GetBucket(storage_key, bucket_name, type,
+ std::move(respond));
}
void QuotaManagerProxy::DeleteBucket(
@@ -303,16 +271,16 @@
}
DCHECK_CALLED_ON_VALID_SEQUENCE(quota_manager_impl_sequence_checker_);
+
+ auto respond =
+ base::BindPostTask(std::move(callback_task_runner), std::move(callback));
if (!quota_manager_impl_) {
- DidGetStatus(std::move(callback_task_runner), std::move(callback),
- blink::mojom::QuotaStatusCode::kUnknown);
+ std::move(respond).Run(blink::mojom::QuotaStatusCode::kUnknown);
return;
}
- quota_manager_impl_->FindAndDeleteBucketData(
- storage_key, bucket_name,
- base::BindOnce(&DidGetStatus, std::move(callback_task_runner),
- std::move(callback)));
+ quota_manager_impl_->FindAndDeleteBucketData(storage_key, bucket_name,
+ std::move(respond));
}
void QuotaManagerProxy::NotifyStorageAccessed(const StorageKey& storage_key,
