Plumbs URLRequestContext and CacheBlobStorageContext down to cache.

content/browser/service_worker/service_worker_cache_storage.cc

 // 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.
 
 #include "content/browser/service_worker/service_worker_cache_storage.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/memory/ref_counted.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "content/browser/service_worker/service_worker_cache.h"
 #include "content/browser/service_worker/service_worker_cache.pb.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/directory_lister.h"
 #include "net/base/net_errors.h"
+#include "webkit/browser/blob/blob_storage_context.h"
 
 namespace content {
 
 // Handles the loading and clean up of ServiceWorkerCache objects.
 class ServiceWorkerCacheStorage::CacheLoader
     : public base::RefCountedThreadSafe<
           ServiceWorkerCacheStorage::CacheLoader> {
  public:
   typedef base::Callback<void(scoped_ptr<ServiceWorkerCache>)> CacheCallback;
   typedef base::Callback<void(bool)> BoolCallback;
   typedef base::Callback<void(scoped_ptr<std::vector<std::string> >)>
       StringsCallback;
 
-  explicit CacheLoader(base::SequencedTaskRunner* cache_task_runner)
-      : cache_task_runner_(cache_task_runner) {}
+  explicit CacheLoader(
+      base::SequencedTaskRunner* cache_task_runner,
+      net::URLRequestContext* request_context,
+      const base::WeakPtr<webkit_blob::BlobStorageContext>& blob_context)

[michaeln, 2014/08/13 00:11:28]

either pass by value or const ref throughout to be self-consistent?

[jkarlin, 2014/08/13 00:34:40]

Done.

+      : cache_task_runner_(cache_task_runner),
+        request_context_(request_context),
+        blob_context_(blob_context) {}
 
   // Loads the given cache_name, the cache is NULL if it fails. If the cache
   // doesn't exist a new one is created.
   virtual void LoadCache(const std::string& cache_name,
                          const CacheCallback& callback) = 0;
 
   // Deletes any pre-existing cache of the same name and then loads it.
   virtual void CreateCache(const std::string& cache_name,
                            const CacheCallback& callback) = 0;
 
@@ skipping 10 matching lines @@
                          const StringsCallback& callback) = 0;
 
  protected:
   friend class base::RefCountedThreadSafe<
       ServiceWorkerCacheStorage::CacheLoader>;
 
   virtual ~CacheLoader() {};
   virtual void LoadCacheImpl(const std::string&) {}
 
   scoped_refptr<base::SequencedTaskRunner> cache_task_runner_;
+  net::URLRequestContext* request_context_;
+  base::WeakPtr<webkit_blob::BlobStorageContext> blob_context_;
 };
 
 class ServiceWorkerCacheStorage::MemoryLoader
     : public ServiceWorkerCacheStorage::CacheLoader {
  public:
-  explicit MemoryLoader(base::SequencedTaskRunner* cache_task_runner)
-      : CacheLoader(cache_task_runner) {}
+  explicit MemoryLoader(
+      base::SequencedTaskRunner* cache_task_runner,
+      net::URLRequestContext* request_context,
+      const base::WeakPtr<webkit_blob::BlobStorageContext>& blob_context)
+      : CacheLoader(cache_task_runner, request_context, blob_context) {}
   virtual void LoadCache(const std::string& cache_name,
                          const CacheCallback& callback) OVERRIDE {
     NOTREACHED();
   }
 
   virtual void CreateCache(const std::string& cache_name,
                            const CacheCallback& callback) OVERRIDE {
     scoped_ptr<ServiceWorkerCache> cache =
-        ServiceWorkerCache::CreateMemoryCache(cache_name);
+        ServiceWorkerCache::CreateMemoryCache(
+            cache_name, request_context_, blob_context_);
     callback.Run(cache.Pass());
   }
 
   virtual void CleanUpDeletedCache(const std::string& cache_name,
                                    const BoolCallback& callback) OVERRIDE {
     callback.Run(true);
   }
 
   virtual void WriteIndex(CacheMap* caches,
                           const BoolCallback& callback) OVERRIDE {
     callback.Run(false);
   }
 
   virtual void LoadIndex(scoped_ptr<std::vector<std::string> > cache_names,
                          const StringsCallback& callback) OVERRIDE {
     callback.Run(cache_names.Pass());
   }
 
  private:
   virtual ~MemoryLoader() {}
 };
 
 class ServiceWorkerCacheStorage::SimpleCacheLoader
     : public ServiceWorkerCacheStorage::CacheLoader {
  public:
   SimpleCacheLoader(const base::FilePath& origin_path,
-                    base::SequencedTaskRunner* cache_task_runner)
-      : CacheLoader(cache_task_runner), origin_path_(origin_path) {}
+                    base::SequencedTaskRunner* cache_task_runner,
+                    net::URLRequestContext* request_context,
+                    base::WeakPtr<webkit_blob::BlobStorageContext> blob_context)
+      : CacheLoader(cache_task_runner, request_context, blob_context),
+        origin_path_(origin_path) {}
 
   virtual void LoadCache(const std::string& cache_name,
                          const CacheCallback& callback) OVERRIDE {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
     // 1. Create the cache's directory if necessary. (LoadCreateDirectoryInPool)
     // 2. Create the cache object. (LoadDidCreateDirectory)
 
     cache_task_runner_->PostTask(
         FROM_HERE,
@@ skipping 24 matching lines @@
 
   void LoadDidCreateDirectory(const std::string& cache_name,
                               const CacheCallback& callback,
                               bool dir_rv) {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
     if (!dir_rv) {
       callback.Run(scoped_ptr<ServiceWorkerCache>());
       return;
     }
-    base::FilePath cache_path =
-        CreatePersistentCachePath(origin_path_, cache_name);
-    scoped_ptr<ServiceWorkerCache> cache(
-        ServiceWorkerCache::CreatePersistentCache(cache_path, cache_name));
+
+    scoped_ptr<ServiceWorkerCache> cache =
+        ServiceWorkerCache::CreatePersistentCache(
+            CreatePersistentCachePath(origin_path_, cache_name),
+            cache_name,
+            request_context_,
+            blob_context_);
     callback.Run(cache.Pass());
   }
 
   virtual void CreateCache(const std::string& cache_name,
                            const CacheCallback& callback) OVERRIDE {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
     // 1. Delete the cache's directory if it exists.
     // (CreateCacheDeleteFilesInPool)
     // 2. Load the cache. (LoadCreateDirectoryInPool)
@@ skipping 185 matching lines @@
                                            const std::string& cache_name) {
     return origin_path.AppendASCII(HexedHash(cache_name));
   }
 
   const base::FilePath origin_path_;
 };
 
 ServiceWorkerCacheStorage::ServiceWorkerCacheStorage(
     const base::FilePath& path,
     bool memory_only,
-    base::SequencedTaskRunner* cache_task_runner)
+    base::SequencedTaskRunner* cache_task_runner,
+    net::URLRequestContext* request_context,
+    base::WeakPtr<webkit_blob::BlobStorageContext> blob_context)
     : initialized_(false),
       origin_path_(path),
       cache_task_runner_(cache_task_runner),
       weak_factory_(this) {
   if (memory_only)
-    cache_loader_ = new MemoryLoader(cache_task_runner_);
+    cache_loader_ =
+        new MemoryLoader(cache_task_runner_, request_context, blob_context);
   else
-    cache_loader_ = new SimpleCacheLoader(origin_path_, cache_task_runner_);
+    cache_loader_ = new SimpleCacheLoader(
+        origin_path_, cache_task_runner_, request_context, blob_context);
 }
 
 ServiceWorkerCacheStorage::~ServiceWorkerCacheStorage() {
 }
 
 void ServiceWorkerCacheStorage::CreateCache(
     const std::string& cache_name,
     const CacheAndErrorCallback& callback) {
   if (!initialized_) {
     LazyInit(base::Bind(&ServiceWorkerCacheStorage::CreateCache,
@@ skipping 306 matching lines @@
   NameMap::const_iterator it = name_map_.find(cache_name);
   if (it == name_map_.end())
     return NULL;
 
   ServiceWorkerCache* cache = cache_map_.Lookup(it->second);
   DCHECK(cache);
   return cache;
 }
 
 }  // namespace content