Organize ServiceWorkerCacheStorage's methods.

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 81 matching lines @@
 
  private:
   class MemoryLoader;
   class SimpleCacheLoader;
   class CacheLoader;
   struct CacheContext;
 
   typedef std::map<CacheID, CacheContext*> CacheMap;
   typedef std::map<std::string, CacheID> NameMap;
 
+  // Scans the filesystem for stored caches and creates a CacheContext (without
+  // instantiating a backend) for each.
+  void LazyInit(const base::Closure& closure);
+
   CacheContext* GetLoadedCache(const std::string& cache_name) const;
+  CacheContext* AddCacheToMaps(const std::string& cache_name,
+                               scoped_ptr<ServiceWorkerCache> cache);
 
-  // Initializer and its callback are below.
-  void LazyInit(const base::Closure& closure);
+  // The initialization callbacks are below.
   static void LazyInitDidLoadIndex(
       const base::Closure& callback,
       base::WeakPtr<ServiceWorkerCacheStorage> storage,
       scoped_ptr<std::vector<std::string> > indexed_cache_names);
   static void LazyInitIterateAndLoadCacheName(
       const base::Closure& callback,
       base::WeakPtr<ServiceWorkerCacheStorage> storage,
       scoped_ptr<std::vector<std::string> > indexed_cache_names,
       const std::vector<std::string>::const_iterator& iter,
       const std::string& cache_name,
       scoped_ptr<ServiceWorkerCache> cache);
   static void LazyInitDone(base::WeakPtr<ServiceWorkerCacheStorage> storage);
 
-  static void DidCreateBackend(base::WeakPtr<ServiceWorkerCache> cache,
-                               CacheID cache_id,
-                               const CacheAndErrorCallback& callback,
-                               ServiceWorkerCache::ErrorType error);
-
-  CacheContext* AddCacheToMaps(const std::string& cache_name,
-                               scoped_ptr<ServiceWorkerCache> cache);
-
   // The CreateCache callbacks are below.
   static void CreateCacheDidCreateCache(
       const std::string& cache_name,
       const CacheAndErrorCallback& callback,
       base::WeakPtr<ServiceWorkerCacheStorage> storage,
       scoped_ptr<ServiceWorkerCache> cache);
   static void CreateCacheDidWriteIndex(const CacheAndErrorCallback& callback,
                                        base::WeakPtr<ServiceWorkerCache> cache,
                                        CacheID id,
                                        bool success);
 
   // The DeleteCache callbacks are below.
   static void DeleteCacheDidWriteIndex(
       const std::string& cache_name,
       const BoolAndErrorCallback& callback,
       base::WeakPtr<ServiceWorkerCacheStorage> storage,
       bool success);
   static void DeleteCacheDidCleanUp(const BoolAndErrorCallback& callback,
                                     bool success);
 
+  static void DidCreateBackend(base::WeakPtr<ServiceWorkerCache> cache,
+                               CacheID cache_id,
+                               const CacheAndErrorCallback& callback,
+                               ServiceWorkerCache::ErrorType error);
+
   // 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 CacheIDs to their CacheContext objects. Owns the CacheContext
   // object. The CacheIDs are used by JavaScript to reference a
   // ServiceWorkerCache.
   CacheMap cache_map_;
@@ skipping 12 matching lines @@
   scoped_refptr<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_