chromium/src
0
Fork 0
Code Activity

Quota: Cleanup unused QuotaType

Browse Source 
Final change to cleanup remnants of `blink::mojom::StorageType`
and StorageType definitions.

Bug: 40211051
Change-Id: I5b1d1053832cf20029054d1ba0f6110c249cee77
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6512911
Reviewed-by: Mustafa Emre Acer <meacer@chromium.org>
Reviewed-by: Tsuyoshi Horo <horo@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Commit-Queue: Ayu Ishii <ayui@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1456675}
This commit is contained in:
Ayu Ishii
2025-05-06 17:09:56 -07:00
committed by Chromium LUCI CQ
parent 681ca9b61e
commit bc108500c7
12 changed files with 4 additions and 30 deletions

1
chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc

@ -28,7 +28,6 @@
#include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
#include "third_party/leveldatabase/leveldb_chrome.h"
using blink::mojom::StorageType;
using storage::FileSystemContext;
using storage::FileSystemOperationContext;
using storage::FileSystemURL;

1
components/browsing_data/content/browsing_data_quota_helper_impl.cc

@ -21,7 +21,6 @@
#include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
#include "url/origin.h"
using blink::mojom::StorageType;
using content::BrowserContext;
using content::BrowserThread;

2
components/browsing_data/content/browsing_data_quota_helper_impl.h

@ -42,8 +42,6 @@ class BrowsingDataQuotaHelperImpl : public BrowsingDataQuotaHelper {
delete;
private:
using PendingHosts =
std::set<std::pair<std::string, blink::mojom::StorageType>>;
using QuotaInfoMap = std::map<blink::StorageKey, QuotaInfo>;
~BrowsingDataQuotaHelperImpl() override;

1
content/browser/cache_storage/cache_storage.cc

@ -56,7 +56,6 @@
#include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
using blink::mojom::CacheStorageError;
using blink::mojom::StorageType;
namespace content {

1
content/browser/cache_storage/cache_storage_manager_unittest.cc

@ -99,7 +99,6 @@ enum class StorageKeyAndBucketTestCase {
kThirdPartyNamed,
};
using blink::mojom::StorageType;
using ResponseHeaderMap = base::flat_map<std::string, std::string>;
constexpr char16_t kReplacementCharacter = 0xFFFD;

1
content/browser/service_worker/service_worker_quota_client.cc

@ -18,7 +18,6 @@
#include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
#include "url/origin.h"
using ::blink::mojom::StorageType;
using ::storage::mojom::QuotaClient;
namespace content {

6
storage/browser/quota/quota_database_migrations.cc

@ -27,6 +27,9 @@ namespace {
// The name for the implicit/default bucket before V10.
constexpr char kDefaultNamePreV10[] = "default";
// Quota type for deprecated persistent quota.
constexpr int kDeprecatedPersistentQuotaType = 1;
// Overwrites the buckets table with the new_buckets table after data has been
// copied from the former into the latter.
bool OverwriteBucketsTableSetUpIndexes(sql::Database* db) {
@ -351,8 +354,7 @@ bool QuotaDatabaseMigrations::MigrateFromVersion9ToVersion10(
"DELETE FROM buckets WHERE type = ? ";
sql::Statement delete_statement(
db->GetCachedStatement(SQL_FROM_HERE, kDeletePersistentTypeBuckets));
delete_statement.BindInt(
0, static_cast<int>(blink::mojom::StorageType::kDeprecatedPersistent));
delete_statement.BindInt(0, kDeprecatedPersistentQuotaType);
if (!delete_statement.Run()) {
return false;
}

1
storage/browser/quota/quota_manager_impl.cc

@ -74,7 +74,6 @@
#include "url/origin.h"
using ::blink::StorageKey;
using ::blink::mojom::StorageType;
namespace storage {

1
storage/browser/quota/quota_manager_unittest.cc

@ -60,7 +60,6 @@
using ::blink::StorageKey;
using ::blink::mojom::QuotaStatusCode;
using ::blink::mojom::StorageType;
namespace storage {

2
storage/browser/quota/quota_temporary_storage_evictor_unittest.cc

@ -25,8 +25,6 @@
#include "storage/browser/quota/quota_temporary_storage_evictor.h"
#include "testing/gtest/include/gtest/gtest.h"
using ::blink::mojom::StorageType;
namespace storage {
class QuotaTemporaryStorageEvictorTest;

1
storage/browser/quota/usage_tracker_unittest.cc

@ -32,7 +32,6 @@
using ::blink::StorageKey;
using ::blink::mojom::QuotaStatusCode;
using ::blink::mojom::StorageType;
namespace storage {

16
third_party/blink/public/mojom/quota/quota_types.mojom vendored

@ -4,22 +4,6 @@
module blink.mojom;
// Values are persisted to disk.
// Do not renumber or delete existing values, to avoid data loss.
// Eventually `kTemporary` will be the only supported quota storage type, but
// since all enum values may have been persisted to disk, we cannot remove any
// enum values until all other values have been deprecated.
enum StorageType {
kTemporary = 0,
// TODO(https://crbug.com/1175113): Remove this type.
kDeprecatedPersistent = 1,
// TODO(https://crbug.com/1286964): Deprecate and remove this type.
kSyncable = 2,
// TODO(https://crbug.com/1095844): Remove this type.
kDeprecatedQuotaNotManaged = 3,
kUnknown = 4,
};
// The durability policy to apply to a single StorageBucket. The values are
// persisted to the quota DB and must not be changed.
enum BucketDurability {