Sort ServiceWorkerCacheStorage::Keys() by creation order.

content/browser/service_worker/service_worker_cache_storage.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_STORAGE_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CACHE_STORAGE_H_
 
 #include <map>
 #include <string>
 
@@ skipping 24 matching lines @@
 class CONTENT_EXPORT ServiceWorkerCacheStorage {
  public:
   enum CacheStorageError {
     CACHE_STORAGE_ERROR_NO_ERROR,
     CACHE_STORAGE_ERROR_NOT_IMPLEMENTED,
     CACHE_STORAGE_ERROR_NOT_FOUND,
     CACHE_STORAGE_ERROR_EXISTS,
     CACHE_STORAGE_ERROR_STORAGE,
     CACHE_STORAGE_ERROR_CLOSING
   };
-
+  typedef std::vector<std::string> StringVector;
   typedef base::Callback<void(bool, CacheStorageError)> BoolAndErrorCallback;
   typedef base::Callback<void(const scoped_refptr<ServiceWorkerCache>&,
                               CacheStorageError)> CacheAndErrorCallback;
-  typedef base::Callback<void(const std::vector<std::string>&,
-                              CacheStorageError)> StringsAndErrorCallback;
+  typedef base::Callback<void(const StringVector&, CacheStorageError)>
+      StringsAndErrorCallback;
 
   ServiceWorkerCacheStorage(
       const base::FilePath& origin_path,
       bool memory_only,
       base::SequencedTaskRunner* cache_task_runner,
       net::URLRequestContext* request_context,
       base::WeakPtr<storage::BlobStorageContext> blob_context);
 
   virtual ~ServiceWorkerCacheStorage();
 
@@ skipping 27 matching lines @@
   class SimpleCacheLoader;
   class CacheLoader;
 
   typedef std::map<std::string, base::WeakPtr<ServiceWorkerCache> > CacheMap;
 
   // Return a ServiceWorkerCache for the given name if the name is known. If the
   // ServiceWorkerCache has been deleted, creates a new one.
   scoped_refptr<ServiceWorkerCache> GetLoadedCache(
       const std::string& cache_name);
 
-  // Initializer and its callback are below.
+  // Initializer and its callback are below. While LazyInit is running any new
+  // operations will be queued and started in order after initialization.
   void LazyInit(const base::Closure& closure);
   void LazyInitDidLoadIndex(
       const base::Closure& callback,
       scoped_ptr<std::vector<std::string> > indexed_cache_names);
 
   void AddCacheToMap(const std::string& cache_name,
                      base::WeakPtr<ServiceWorkerCache> cache);
 
   // The CreateCache callbacks are below.
   void CreateCacheDidCreateCache(
@@ skipping 13 matching lines @@
 
   // Whether or not we've loaded the list of cache names into memory.
   bool initialized_;
 
   // The list of operations waiting on initialization.
   std::vector<base::Closure> init_callbacks_;
 
   // The map of cache names to ServiceWorkerCache objects.
   CacheMap cache_map_;
 
+  // The names of caches in the order that they were created.
+  StringVector ordered_cache_names_;
+
   // The file path for this CacheStorage.
   base::FilePath origin_path_;
 
   // The TaskRunner to run file IO on.
   scoped_refptr<base::SequencedTaskRunner> cache_task_runner_;
 
   // Whether or not to store data in disk or memory.
   bool memory_only_;
 
   // Performs backend specific operations (memory vs disk).
   scoped_ptr<CacheLoader> cache_loader_;
 
   base::WeakPtrFactory<ServiceWorkerCacheStorage> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerCacheStorage);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CACHE_STORAGE_H_