ServiceWorker: Consolidate database state members for cleanup

content/browser/service_worker/service_worker_database.h

 // 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.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DATABASE_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DATABASE_H_
 
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 162 matching lines @@
   Status ClearPurgeableResourceIds(const std::set<int64>& ids);
 
   // Deletes all data for |origin|, namely, unique origin, registrations and
   // resource records. Resources are moved to the purgeable list. Returns OK if
   // they are successfully deleted or not found in the database. Otherwise,
   // returns an error.
   Status DeleteAllDataForOrigin(
       const GURL& origin,
       std::vector<int64>* newly_purgeable_resources);
 
-  bool is_disabled() const { return is_disabled_; }
-  bool was_corruption_detected() const { return was_corruption_detected_; }
-
  private:
   // Opens the database at the |path_|. This is lazily called when the first
   // database API is called. Returns OK if the database is successfully opened.
   // Returns NOT_FOUND if the database does not exist and |create_if_missing| is
   // false. Otherwise, returns an error.
   Status LazyOpen(bool create_if_missing);
 
   // Helper for LazyOpen(). |status| must be the return value from LazyOpen()
   // and this must be called just after LazyOpen() is called. Returns true if
   // the database is new or nonexistent, that is, it has never been used.
@@ skipping 73 matching lines @@
       const leveldb::Status& status);
 
   base::FilePath path_;
   scoped_ptr<leveldb::Env> env_;
   scoped_ptr<leveldb::DB> db_;
 
   int64 next_avail_registration_id_;
   int64 next_avail_resource_id_;
   int64 next_avail_version_id_;
 
-  // True if a database error has occurred (e.g. cannot read data).
-  // If true, all database accesses will fail.
-  bool is_disabled_;
-
-  // True if a database corruption was detected.
-  bool was_corruption_detected_;
-
-  // True if a database was initialized, that is, the schema version was written
-  // in the database.
-  bool is_initialized_;
+  enum State {
+    UNINITIALIZED,
+    INITIALIZED,
+    DISABLED,
+  };
+  State state_;
 
   base::SequenceChecker sequence_checker_;
 
   FRIEND_TEST_ALL_PREFIXES(ServiceWorkerDatabaseTest, OpenDatabase);
   FRIEND_TEST_ALL_PREFIXES(ServiceWorkerDatabaseTest, OpenDatabase_InMemory);
   FRIEND_TEST_ALL_PREFIXES(ServiceWorkerDatabaseTest, DatabaseVersion);
   FRIEND_TEST_ALL_PREFIXES(ServiceWorkerDatabaseTest, GetNextAvailableIds);
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerDatabase);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DATABASE_H_