ServiceWorker: Clean up ServiceWorkerDatabase

content/browser/service_worker/service_worker_database.h

Index: content/browser/service_worker/service_worker_database.h
diff --git a/content/browser/service_worker/service_worker_database.h b/content/browser/service_worker/service_worker_database.h
index dc21acb30f7cf3fb86b62d373a55713ddb28f0ef..889f983667230a56d028a58ec2e28ca848338d9e 100644
--- a/content/browser/service_worker/service_worker_database.h
+++ b/content/browser/service_worker/service_worker_database.h
@@ -17,17 +17,17 @@
 namespace leveldb {
 class DB;
 class Env;
-class Slice;
+class Status;
 class WriteBatch;
 }
 
 namespace content {
 
-// Class to persist serviceworker regitration data in a database.
+// Class to persist serviceworker registration data in a database.
 // Should NOT be used on the IO thread since this does blocking
 // file io. The ServiceWorkerStorage class owns this class and
 // is responsible for only calling it serially on background
-// nonIO threads (ala SequencedWorkerPool).
+// non-IO threads (ala SequencedWorkerPool).
 class CONTENT_EXPORT ServiceWorkerDatabase {
  public:
   // We do leveldb stuff in |path| or in memory if |path| is empty.
@@ -77,12 +77,16 @@ class CONTENT_EXPORT ServiceWorkerDatabase {
   // and next available IDs.
   bool PopulateInitialData();
 
-  bool ReadInt64(const leveldb::Slice& key, int64* value_out);
-  bool WriteBatch(scoped_ptr<leveldb::WriteBatch> batch);
+  bool ReadNextAvailableId(const char* id_key,
+                           int64* next_avail_id);
+  bool WriteBatch(leveldb::WriteBatch* batch);
 
   bool IsOpen();
   bool IsEmpty();
 
+  void HandleError(const tracked_objects::Location& from_here,
+                   const leveldb::Status& status);
+
   base::FilePath path_;
   scoped_ptr<leveldb::Env> env_;
   scoped_ptr<leveldb::DB> db_;