Index: content/browser/service_worker/service_worker_database.cc |
diff --git a/content/browser/service_worker/service_worker_database.cc b/content/browser/service_worker/service_worker_database.cc |
index b79894ea803f780814b0ea13c17f2e17424ff021..153be6e50261c2b59765fe82433e43bce0374e7d 100644 |
--- a/content/browser/service_worker/service_worker_database.cc |
+++ b/content/browser/service_worker/service_worker_database.cc |
@@ -1025,12 +1025,12 @@ ServiceWorkerDatabase::GetUncommittedResourceIds(std::set<int64>* ids) { |
ServiceWorkerDatabase::Status |
ServiceWorkerDatabase::WriteUncommittedResourceIds(const std::set<int64>& ids) { |
- return WriteResourceIds(kUncommittedResIdKeyPrefix, ids); |
-} |
- |
-ServiceWorkerDatabase::Status |
-ServiceWorkerDatabase::ClearUncommittedResourceIds(const std::set<int64>& ids) { |
- return DeleteResourceIds(kUncommittedResIdKeyPrefix, ids); |
+ leveldb::WriteBatch batch; |
+ Status status = |
+ WriteResourceIdsInBatch(kUncommittedResIdKeyPrefix, ids, &batch); |
+ if (status != STATUS_OK) |
+ return status; |
+ return WriteBatch(&batch); |
} |
ServiceWorkerDatabase::Status |
@@ -1039,13 +1039,13 @@ ServiceWorkerDatabase::GetPurgeableResourceIds(std::set<int64>* ids) { |
} |
ServiceWorkerDatabase::Status |
-ServiceWorkerDatabase::WritePurgeableResourceIds(const std::set<int64>& ids) { |
- return WriteResourceIds(kPurgeableResIdKeyPrefix, ids); |
-} |
- |
-ServiceWorkerDatabase::Status |
ServiceWorkerDatabase::ClearPurgeableResourceIds(const std::set<int64>& ids) { |
- return DeleteResourceIds(kPurgeableResIdKeyPrefix, ids); |
+ leveldb::WriteBatch batch; |
+ Status status = |
+ DeleteResourceIdsInBatch(kPurgeableResIdKeyPrefix, ids, &batch); |
+ if (status != STATUS_OK) |
+ return status; |
+ return WriteBatch(&batch); |
} |
ServiceWorkerDatabase::Status |
@@ -1404,16 +1404,6 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadResourceIds( |
return status; |
} |
-ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteResourceIds( |
- const char* id_key_prefix, |
- const std::set<int64>& ids) { |
- leveldb::WriteBatch batch; |
- Status status = WriteResourceIdsInBatch(id_key_prefix, ids, &batch); |
- if (status != STATUS_OK) |
- return status; |
- return WriteBatch(&batch); |
-} |
- |
ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteResourceIdsInBatch( |
const char* id_key_prefix, |
const std::set<int64>& ids, |
@@ -1437,16 +1427,6 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteResourceIdsInBatch( |
return STATUS_OK; |
} |
-ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteResourceIds( |
- const char* id_key_prefix, |
- const std::set<int64>& ids) { |
- leveldb::WriteBatch batch; |
- Status status = DeleteResourceIdsInBatch(id_key_prefix, ids, &batch); |
- if (status != STATUS_OK) |
- return status; |
- return WriteBatch(&batch); |
-} |
- |
ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteResourceIdsInBatch( |
const char* id_key_prefix, |
const std::set<int64>& ids, |