chromium/src
0
Fork 0
Code Activity

Quota: Remove usage of GetOrCreateBucketDeprecated

Browse Source 
This change removes GetOrCreateBucketDeprecated since buckets
no longer need to specify StorageType due to all types being
deprecated except for StorageType::kTemporary. Further cleanup
to remove usages from QuotaManager/QuotaDatabase will follow.

Bug: 40211051
Change-Id: I42cfc9fd148a044972fa25a311d3a3e43c0775f3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6302638
Commit-Queue: Ayu Ishii <ayui@chromium.org>
Reviewed-by: Ming-Ying Chung <mych@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1425214}
This commit is contained in:
Ayu Ishii
2025-02-26 09:26:24 -08:00
committed by Chromium LUCI CQ
parent 7eb8c1c00e
commit 8ca173336b
3 changed files with 4 additions and 46 deletions

10
storage/browser/file_system/file_system_context.cc

@@ -411,9 +411,8 @@ void FileSystemContext::OpenFileSystem(
} else { } else {
// Ensure default bucket for `storage_key` exists so that Quota API // Ensure default bucket for `storage_key` exists so that Quota API
// is aware of the usage. // is aware of the usage.
quota_manager_proxy()->GetOrCreateBucketDeprecated( quota_manager_proxy()->UpdateOrCreateBucket(
BucketInitParams::ForDefaultBucket(storage_key), BucketInitParams::ForDefaultBucket(storage_key), io_task_runner_.get(),
FileSystemTypeToQuotaStorageType(type), io_task_runner_.get(),
std::move(got_bucket)); std::move(got_bucket));
} }
} }
@@ -539,9 +538,8 @@ void FileSystemContext::DeleteFileSystem(const blink::StorageKey& storage_key,
return; return;
} }
quota_manager_proxy()->GetOrCreateBucketDeprecated( quota_manager_proxy()->UpdateOrCreateBucket(
BucketInitParams::ForDefaultBucket(storage_key), BucketInitParams::ForDefaultBucket(storage_key), io_task_runner_.get(),
FileSystemTypeToQuotaStorageType(type), io_task_runner_.get(),
base::BindOnce(&FileSystemContext::OnGetBucketForDeleteFileSystem, base::BindOnce(&FileSystemContext::OnGetBucketForDeleteFileSystem,
weak_factory_.GetWeakPtr(), type, std::move(callback))); weak_factory_.GetWeakPtr(), type, std::move(callback)));
} }

30
storage/browser/quota/quota_manager_proxy.cc

@@ -181,36 +181,6 @@ QuotaErrorOr<BucketInfo> QuotaManagerProxy::GetOrCreateBucketSync(
return bucket; return bucket;
} }
void QuotaManagerProxy::GetOrCreateBucketDeprecated(
const BucketInitParams& params,
blink::mojom::StorageType storage_type,
scoped_refptr<base::SequencedTaskRunner> callback_task_runner,
base::OnceCallback<void(QuotaErrorOr<BucketInfo>)> callback) {
DCHECK(callback_task_runner);
DCHECK(callback);
if (!quota_manager_impl_task_runner_->RunsTasksInCurrentSequence()) {
quota_manager_impl_task_runner_->PostTask(
FROM_HERE,
base::BindOnce(&QuotaManagerProxy::GetOrCreateBucketDeprecated, this,
params, storage_type, std::move(callback_task_runner),
std::move(callback)));
return;
}
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_) {
std::move(respond).Run(base::unexpected(QuotaError::kUnknownError));
return;
}
quota_manager_impl_->GetOrCreateBucketDeprecated(params, storage_type,
std::move(respond));
}
void QuotaManagerProxy::CreateBucketForTesting( void QuotaManagerProxy::CreateBucketForTesting(
const StorageKey& storage_key, const StorageKey& storage_key,
const std::string& bucket_name, const std::string& bucket_name,

10
storage/browser/quota/quota_manager_proxy.h

@@ -104,16 +104,6 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) QuotaManagerProxy
virtual QuotaErrorOr<BucketInfo> GetOrCreateBucketSync( virtual QuotaErrorOr<BucketInfo> GetOrCreateBucketSync(
const BucketInitParams& params); const BucketInitParams& params);
// Same as GetOrCreateBucket but takes in StorageType. This should only be
// used by FileSystem, and is expected to be removed when
// StorageType::kSyncable and StorageType::kPersistent are deprecated.
// (crbug.com/1233525, crbug.com/1286964).
virtual void GetOrCreateBucketDeprecated(
const BucketInitParams& params,
blink::mojom::StorageType storage_type,
scoped_refptr<base::SequencedTaskRunner> callback_task_runner,
base::OnceCallback<void(QuotaErrorOr<BucketInfo>)> callback);
// Creates a bucket for `origin` with `bucket_name` and returns the // Creates a bucket for `origin` with `bucket_name` and returns the
// BucketInfo to the callback. Returns a QuotaError to the callback // BucketInfo to the callback. Returns a QuotaError to the callback
// on operation failure. // on operation failure.