Index: content/browser/service_worker/service_worker_cache_storage.cc |
diff --git a/content/browser/service_worker/service_worker_cache_storage.cc b/content/browser/service_worker/service_worker_cache_storage.cc |
index 8a9c6c4d266b029aa591b275acbaab4d2003d108..28138e1471f9bdbc8cb33d730afa710fb4d02aa4 100644 |
--- a/content/browser/service_worker/service_worker_cache_storage.cc |
+++ b/content/browser/service_worker/service_worker_cache_storage.cc |
@@ -17,7 +17,7 @@ |
#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" |
+#include "storage/browser/blob/blob_storage_context.h" |
namespace content { |
@@ -31,10 +31,9 @@ class ServiceWorkerCacheStorage::CacheLoader |
typedef base::Callback<void(scoped_ptr<std::vector<std::string> >)> |
StringsCallback; |
- CacheLoader( |
- base::SequencedTaskRunner* cache_task_runner, |
- net::URLRequestContext* request_context, |
- base::WeakPtr<webkit_blob::BlobStorageContext> blob_context) |
+ CacheLoader(base::SequencedTaskRunner* cache_task_runner, |
+ net::URLRequestContext* request_context, |
+ base::WeakPtr<storage::BlobStorageContext> blob_context) |
: cache_task_runner_(cache_task_runner), |
request_context_(request_context), |
blob_context_(blob_context) {} |
@@ -69,16 +68,15 @@ class ServiceWorkerCacheStorage::CacheLoader |
scoped_refptr<base::SequencedTaskRunner> cache_task_runner_; |
net::URLRequestContext* request_context_; |
- base::WeakPtr<webkit_blob::BlobStorageContext> blob_context_; |
+ base::WeakPtr<storage::BlobStorageContext> blob_context_; |
}; |
class ServiceWorkerCacheStorage::MemoryLoader |
: public ServiceWorkerCacheStorage::CacheLoader { |
public: |
- MemoryLoader( |
- base::SequencedTaskRunner* cache_task_runner, |
- net::URLRequestContext* request_context, |
- base::WeakPtr<webkit_blob::BlobStorageContext> blob_context) |
+ MemoryLoader(base::SequencedTaskRunner* cache_task_runner, |
+ net::URLRequestContext* request_context, |
+ base::WeakPtr<storage::BlobStorageContext> blob_context) |
: CacheLoader(cache_task_runner, request_context, blob_context) {} |
virtual void LoadCache(const std::string& cache_name, |
const CacheCallback& callback) OVERRIDE { |
@@ -118,7 +116,7 @@ class ServiceWorkerCacheStorage::SimpleCacheLoader |
SimpleCacheLoader(const base::FilePath& origin_path, |
base::SequencedTaskRunner* cache_task_runner, |
net::URLRequestContext* request_context, |
- base::WeakPtr<webkit_blob::BlobStorageContext> blob_context) |
+ base::WeakPtr<storage::BlobStorageContext> blob_context) |
: CacheLoader(cache_task_runner, request_context, blob_context), |
origin_path_(origin_path) {} |
@@ -379,7 +377,7 @@ ServiceWorkerCacheStorage::ServiceWorkerCacheStorage( |
bool memory_only, |
base::SequencedTaskRunner* cache_task_runner, |
net::URLRequestContext* request_context, |
- base::WeakPtr<webkit_blob::BlobStorageContext> blob_context) |
+ base::WeakPtr<storage::BlobStorageContext> blob_context) |
: initialized_(false), |
origin_path_(path), |
cache_task_runner_(cache_task_runner), |