Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7783)

Unified Diff: content/browser/service_worker/service_worker_url_request_job.h

Issue 492873002: Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chromeos build Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/service_worker/service_worker_url_request_job.h
diff --git a/content/browser/service_worker/service_worker_url_request_job.h b/content/browser/service_worker/service_worker_url_request_job.h
index 61a835db8004e77c891d8d6b624766d3de8837cf..eb3c2160b4bda6219ac8a5d64c4220216c144a65 100644
--- a/content/browser/service_worker/service_worker_url_request_job.h
+++ b/content/browser/service_worker/service_worker_url_request_job.h
@@ -16,7 +16,7 @@
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_job.h"
-namespace webkit_blob {
+namespace storage {
class BlobDataHandle;
class BlobStorageContext;
}
@@ -36,7 +36,7 @@ class CONTENT_EXPORT ServiceWorkerURLRequestJob
net::URLRequest* request,
net::NetworkDelegate* network_delegate,
base::WeakPtr<ServiceWorkerProviderHost> provider_host,
- base::WeakPtr<webkit_blob::BlobStorageContext> blob_storage_context,
+ base::WeakPtr<storage::BlobStorageContext> blob_storage_context,
scoped_refptr<ResourceRequestBody> body);
// Sets the response type.
@@ -142,12 +142,12 @@ class CONTENT_EXPORT ServiceWorkerURLRequestJob
// Used when response type is FORWARD_TO_SERVICE_WORKER.
scoped_ptr<ServiceWorkerFetchDispatcher> fetch_dispatcher_;
- base::WeakPtr<webkit_blob::BlobStorageContext> blob_storage_context_;
+ base::WeakPtr<storage::BlobStorageContext> blob_storage_context_;
scoped_ptr<net::URLRequest> blob_request_;
// ResourceRequestBody has a collection of BlobDataHandles attached to it
// using the userdata mechanism. So we have to keep it not to free the blobs.
scoped_refptr<ResourceRequestBody> body_;
- scoped_ptr<webkit_blob::BlobDataHandle> request_body_blob_data_handle_;
+ scoped_ptr<storage::BlobDataHandle> request_body_blob_data_handle_;
base::WeakPtrFactory<ServiceWorkerURLRequestJob> weak_factory_;

Powered by Google App Engine
This is Rietveld 408576698