ServiceWorker: Migrate the script cache backend from BlockFile to Simple

content/browser/appcache/appcache_disk_cache.h

 // Copyright (c) 2012 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_APPCACHE_APPCACHE_DISK_CACHE_H_
 #define CONTENT_BROWSER_APPCACHE_APPCACHE_DISK_CACHE_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 34 matching lines @@
   bool is_disabled() const { return is_disabled_; }
 
   int CreateEntry(int64 key,
                   Entry** entry,
                   const net::CompletionCallback& callback) override;
   int OpenEntry(int64 key,
                 Entry** entry,
                 const net::CompletionCallback& callback) override;
   int DoomEntry(int64 key, const net::CompletionCallback& callback) override;
 
+  void set_is_waiting_to_initialize(bool is_waiting_to_initialize) {
+    is_waiting_to_initialize_ = is_waiting_to_initialize;
+  }
+
  protected:
   explicit AppCacheDiskCache(bool use_simple_cache);
   disk_cache::Backend* disk_cache() { return disk_cache_.get(); }
 
  private:
   class CreateBackendCallbackShim;
   class EntryImpl;
 
   // PendingCalls allow CreateEntry, OpenEntry, and DoomEntry to be called
   // immediately after construction, without waiting for the
@@ skipping 17 matching lines @@
                 Entry** entry, const net::CompletionCallback& callback);
 
     ~PendingCall();
   };
   typedef std::vector<PendingCall> PendingCalls;
 
   class ActiveCall;
   typedef std::set<ActiveCall*> ActiveCalls;
   typedef std::set<EntryImpl*> OpenEntries;
 
-  bool is_initializing() const {
-    return create_backend_callback_.get() != NULL;
+  bool is_initializing_or_waiting_to_initialize() const {
+    return create_backend_callback_.get() != NULL || is_waiting_to_initialize_;
   }
+
   int Init(net::CacheType cache_type,
            const base::FilePath& directory,
            int cache_size,
            bool force,
            const scoped_refptr<base::SingleThreadTaskRunner>& cache_thread,
            const net::CompletionCallback& callback);
   void OnCreateBackendComplete(int rv);
   void AddOpenEntry(EntryImpl* entry) { open_entries_.insert(entry); }
   void RemoveOpenEntry(EntryImpl* entry) { open_entries_.erase(entry); }
 
   bool use_simple_cache_;
   bool is_disabled_;
+  bool is_waiting_to_initialize_;
   net::CompletionCallback init_callback_;
   scoped_refptr<CreateBackendCallbackShim> create_backend_callback_;
   PendingCalls pending_calls_;
   OpenEntries open_entries_;
   scoped_ptr<disk_cache::Backend> disk_cache_;
 
   base::WeakPtrFactory<AppCacheDiskCache> weak_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_DISK_CACHE_H_