ServiceWorker: Remove unnecessary accessors for uncommitted/purgeable resources

content/browser/service_worker/service_worker_database.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/service_worker_database.h"
 
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 1007 matching lines @@
   return status;
 }
 
 ServiceWorkerDatabase::Status
 ServiceWorkerDatabase::GetUncommittedResourceIds(std::set<int64>* ids) {
   return ReadResourceIds(kUncommittedResIdKeyPrefix, ids);
 }
 
 ServiceWorkerDatabase::Status
 ServiceWorkerDatabase::WriteUncommittedResourceIds(const std::set<int64>& ids) {
-  return WriteResourceIds(kUncommittedResIdKeyPrefix, ids);
+  leveldb::WriteBatch batch;
+  Status status =
+      WriteResourceIdsInBatch(kUncommittedResIdKeyPrefix, ids, &batch);
+  if (status != STATUS_OK)
+    return status;
+  return WriteBatch(&batch);
 }
 
 ServiceWorkerDatabase::Status
-ServiceWorkerDatabase::ClearUncommittedResourceIds(const std::set<int64>& ids) {
-  return DeleteResourceIds(kUncommittedResIdKeyPrefix, ids);
-}
-
-ServiceWorkerDatabase::Status
 ServiceWorkerDatabase::GetPurgeableResourceIds(std::set<int64>* ids) {
   return ReadResourceIds(kPurgeableResIdKeyPrefix, 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
 ServiceWorkerDatabase::PurgeUncommittedResourceIds(
     const std::set<int64>& ids) {
   leveldb::WriteBatch batch;
   Status status = DeleteResourceIdsInBatch(
       kUncommittedResIdKeyPrefix, ids, &batch);
   if (status != STATUS_OK)
     return status;
@@ skipping 338 matching lines @@
       ids->clear();
       return status;
     }
     ids->insert(resource_id);
   }
 
   HandleReadResult(FROM_HERE, status);
   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,
     leveldb::WriteBatch* batch) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   DCHECK(id_key_prefix);
 
   Status status = LazyOpen(true);
   if (status != STATUS_OK)
     return status;
 
   if (ids.empty())
     return STATUS_OK;
   for (std::set<int64>::const_iterator itr = ids.begin();
        itr != ids.end(); ++itr) {
     // Value should be empty.
     batch->Put(CreateResourceIdKey(id_key_prefix, *itr), "");
   }
   // std::set is sorted, so the last element is the largest.
   BumpNextResourceIdIfNeeded(*ids.rbegin(), batch);
   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,
     leveldb::WriteBatch* batch) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   DCHECK(id_key_prefix);
 
   Status status = LazyOpen(false);
   if (IsNewOrNonexistentDatabase(status))
     return STATUS_OK;
@@ skipping 139 matching lines @@
   if (status != STATUS_OK)
     Disable(from_here, status);
   ServiceWorkerMetrics::CountWriteDatabaseResult(status);
 }
 
 bool ServiceWorkerDatabase::IsDatabaseInMemory() const {
   return path_.empty();
 }
 
 }  // namespace content