Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

content/browser/service_worker/service_worker_cache.cc

Index: content/browser/service_worker/service_worker_cache.cc
diff --git a/content/browser/service_worker/service_worker_cache.cc b/content/browser/service_worker/service_worker_cache.cc
index d5028f00854f1f2d1241105442ee5f1ec94bb289..4219f190cc6bfe53ab964913372ff1d00379fe01 100644
--- a/content/browser/service_worker/service_worker_cache.cc
+++ b/content/browser/service_worker/service_worker_cache.cc
@@ -16,7 +16,7 @@ namespace content {
 scoped_ptr<ServiceWorkerCache> ServiceWorkerCache::CreateMemoryCache(
     const std::string& name,
     net::URLRequestContext* request_context,
-    base::WeakPtr<webkit_blob::BlobStorageContext> blob_context) {
+    base::WeakPtr<storage::BlobStorageContext> blob_context) {
   return make_scoped_ptr(new ServiceWorkerCache(
       base::FilePath(), name, request_context, blob_context));
 }
@@ -26,7 +26,7 @@ scoped_ptr<ServiceWorkerCache> ServiceWorkerCache::CreatePersistentCache(
     const base::FilePath& path,
     const std::string& name,
     net::URLRequestContext* request_context,
-    base::WeakPtr<webkit_blob::BlobStorageContext> blob_context) {
+    base::WeakPtr<storage::BlobStorageContext> blob_context) {
   return make_scoped_ptr(
       new ServiceWorkerCache(path, name, request_context, blob_context));
 }
@@ -44,7 +44,7 @@ ServiceWorkerCache::ServiceWorkerCache(
     const base::FilePath& path,
     const std::string& name,
     net::URLRequestContext* request_context,
-    base::WeakPtr<webkit_blob::BlobStorageContext> blob_context)
+    base::WeakPtr<storage::BlobStorageContext> blob_context)
     : path_(path),
       name_(name),
       request_context_(request_context),