diff --git a/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc b/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc index b43c217ce23e4..997d9a6179a38 100644 --- a/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc +++ b/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; diff --git a/components/browsing_data/content/browsing_data_quota_helper_impl.cc b/components/browsing_data/content/browsing_data_quota_helper_impl.cc index 9a9864919cf54..97ab9551610da 100644 --- a/components/browsing_data/content/browsing_data_quota_helper_impl.cc +++ b/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; diff --git a/components/browsing_data/content/browsing_data_quota_helper_impl.h b/components/browsing_data/content/browsing_data_quota_helper_impl.h index 5bf3f2c076ddf..94ce616e54af4 100644 --- a/components/browsing_data/content/browsing_data_quota_helper_impl.h +++ b/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; diff --git a/content/browser/cache_storage/cache_storage.cc b/content/browser/cache_storage/cache_storage.cc index ad6cf28ddc31c..7263aff19ee27 100644 --- a/content/browser/cache_storage/cache_storage.cc +++ b/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 { diff --git a/content/browser/cache_storage/cache_storage_manager_unittest.cc b/content/browser/cache_storage/cache_storage_manager_unittest.cc index aff91cd288137..058e79ec95977 100644 --- a/content/browser/cache_storage/cache_storage_manager_unittest.cc +++ b/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; diff --git a/content/browser/service_worker/service_worker_quota_client.cc b/content/browser/service_worker/service_worker_quota_client.cc index d3842b96611d3..afd55e799930f 100644 --- a/content/browser/service_worker/service_worker_quota_client.cc +++ b/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 { diff --git a/storage/browser/quota/quota_database_migrations.cc b/storage/browser/quota/quota_database_migrations.cc index 81abe40054f8b..b69fbcc5ffb96 100644 --- a/storage/browser/quota/quota_database_migrations.cc +++ b/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; } diff --git a/storage/browser/quota/quota_manager_impl.cc b/storage/browser/quota/quota_manager_impl.cc index 85ddf5eebf3cd..26fc10bd02282 100644 --- a/storage/browser/quota/quota_manager_impl.cc +++ b/storage/browser/quota/quota_manager_impl.cc @@ -74,7 +74,6 @@ #include "url/origin.h" using ::blink::StorageKey; -using ::blink::mojom::StorageType; namespace storage { diff --git a/storage/browser/quota/quota_manager_unittest.cc b/storage/browser/quota/quota_manager_unittest.cc index faa1f422a3f35..9748daba2532e 100644 --- a/storage/browser/quota/quota_manager_unittest.cc +++ b/storage/browser/quota/quota_manager_unittest.cc @@ -60,7 +60,6 @@ using ::blink::StorageKey; using ::blink::mojom::QuotaStatusCode; -using ::blink::mojom::StorageType; namespace storage { diff --git a/storage/browser/quota/quota_temporary_storage_evictor_unittest.cc b/storage/browser/quota/quota_temporary_storage_evictor_unittest.cc index 744d54654142f..a02de9bfcbb49 100644 --- a/storage/browser/quota/quota_temporary_storage_evictor_unittest.cc +++ b/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; diff --git a/storage/browser/quota/usage_tracker_unittest.cc b/storage/browser/quota/usage_tracker_unittest.cc index 7736f06803f26..bc85c907e7ad9 100644 --- a/storage/browser/quota/usage_tracker_unittest.cc +++ b/storage/browser/quota/usage_tracker_unittest.cc @@ -32,7 +32,6 @@ using ::blink::StorageKey; using ::blink::mojom::QuotaStatusCode; -using ::blink::mojom::StorageType; namespace storage { diff --git a/third_party/blink/public/mojom/quota/quota_types.mojom b/third_party/blink/public/mojom/quota/quota_types.mojom index d6a982eaa8e47..dbe60111652de 100644 --- a/third_party/blink/public/mojom/quota/quota_types.mojom +++ b/third_party/blink/public/mojom/quota/quota_types.mojom @@ -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 {