Revert of [ServiceWorkerCache Cleanup] Make the state of the cache backend explicit

content/browser/service_worker/service_worker_cache.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_CACHE_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CACHE_H_
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
@@ skipping 90 matching lines @@
 
   base::WeakPtr<ServiceWorkerCache> AsWeakPtr();
 
  private:
   friend class base::RefCounted<ServiceWorkerCache>;
   friend class TestServiceWorkerCache;
 
   class BlobReader;
   struct KeysContext;
   struct PutContext;
-
-  // The backend progresses from uninitialized, to open, to closed, and cannot
-  // reverse direction.  The open step may be skipped.
-  enum BackendState {
-    BackendUninitialized,  // No backend, create backend on first operation.
-    BackendOpen,           // Backend can be used.
-    BackendClosed          // Backend cannot be used.  All ops should fail.
-  };
-
   typedef std::vector<disk_cache::Entry*> Entries;
 
   ServiceWorkerCache(
       const GURL& origin,
       const base::FilePath& path,
       net::URLRequestContext* request_context,
       const scoped_refptr<storage::QuotaManagerProxy>& quota_manager_proxy,
       base::WeakPtr<storage::BlobStorageContext> blob_context);
 
   // Operations in progress will complete after the cache is deleted but pending
@@ skipping 20 matching lines @@
                                    const Entries::iterator& iter);
   static void KeysDidReadMetadata(
       scoped_ptr<KeysContext> keys_context,
       const Entries::iterator& iter,
       scoped_ptr<ServiceWorkerCacheMetadata> metadata);
 
   // Loads the backend and calls the callback with the result (true for
   // success). The callback will always be called. Virtual for tests.
   virtual void CreateBackend(const ErrorCallback& callback);
 
-  void InitBackend(const base::Closure& callback);
+  void Init(const base::Closure& callback);
   void InitDone(ErrorType error);
 
   void IncPendingOps() { pending_ops_++; }
   void DecPendingOps();
   void PendingErrorCallback(const ErrorCallback& callback, ErrorType error);
   void PendingResponseCallback(
       const ResponseCallback& callback,
       ErrorType error,
       scoped_ptr<ServiceWorkerResponse> response,
       scoped_ptr<storage::BlobDataHandle> blob_data_handle);
   void PendingRequestsCallback(const RequestsCallback& callback,
                                ErrorType error,
                                scoped_ptr<Requests> requests);
 
   // The backend can be deleted via the Close function at any time so always
   // check for its existence before use.
   scoped_ptr<disk_cache::Backend> backend_;
   GURL origin_;
   base::FilePath path_;
   net::URLRequestContext* request_context_;
   scoped_refptr<storage::QuotaManagerProxy> quota_manager_proxy_;
   base::WeakPtr<storage::BlobStorageContext> blob_storage_context_;
-  BackendState backend_state_;
+  bool initialized_;
   std::vector<base::Closure> init_callbacks_;
 
   // Whether or not to store data in disk or memory.
   bool memory_only_;
 
   // The number of started operations that have yet to complete.
   // TODO(jkarlin): pending_ops_ gets double counted on lazy initialization (say
   // in ::Put). The counting still works but pending_ops_ doesn't accurately
   // represent the number of operations in flight. Fix this by having the lazy
   // init callback call a different function than the original caller (::Put).
   size_t pending_ops_;
   base::Closure ops_complete_callback_;
 
   base::WeakPtrFactory<ServiceWorkerCache> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerCache);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CACHE_H_