Index: content/browser/loader/resource_dispatcher_host_impl.cc |
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc |
index 3b66397793ba477d9a3831377ff7967635598651..fbcbf1b4447934d35f0bdf3715d0fc0fc8187257 100644 |
--- a/content/browser/loader/resource_dispatcher_host_impl.cc |
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc |
@@ -87,18 +87,18 @@ |
#include "net/url_request/url_request_context.h" |
#include "net/url_request/url_request_job_factory.h" |
#include "url/url_constants.h" |
-#include "webkit/common/blob/blob_data.h" |
-#include "webkit/browser/blob/blob_data_handle.h" |
-#include "webkit/browser/blob/blob_storage_context.h" |
-#include "webkit/browser/blob/blob_url_request_job_factory.h" |
-#include "webkit/browser/fileapi/file_permission_policy.h" |
-#include "webkit/browser/fileapi/file_system_context.h" |
-#include "webkit/common/blob/shareable_file_reference.h" |
+#include "storage/common/blob/blob_data.h" |
+#include "storage/browser/blob/blob_data_handle.h" |
+#include "storage/browser/blob/blob_storage_context.h" |
+#include "storage/browser/blob/blob_url_request_job_factory.h" |
+#include "storage/browser/fileapi/file_permission_policy.h" |
+#include "storage/browser/fileapi/file_system_context.h" |
+#include "storage/common/blob/shareable_file_reference.h" |
using base::Time; |
using base::TimeDelta; |
using base::TimeTicks; |
-using webkit_blob::ShareableFileReference; |
+using storage::ShareableFileReference; |
// ---------------------------------------------------------------------------- |
@@ -200,7 +200,7 @@ void SetReferrerForRequest(net::URLRequest* request, const Referrer& referrer) { |
bool ShouldServiceRequest(int process_type, |
int child_id, |
const ResourceHostMsg_Request& request_data, |
- fileapi::FileSystemContext* file_system_context) { |
+ storage::FileSystemContext* file_system_context) { |
if (process_type == PROCESS_TYPE_PLUGIN) |
return true; |
@@ -227,7 +227,7 @@ bool ShouldServiceRequest(int process_type, |
return false; |
} |
if (iter->type() == ResourceRequestBody::Element::TYPE_FILE_FILESYSTEM) { |
- fileapi::FileSystemURL url = |
+ storage::FileSystemURL url = |
file_system_context->CrackURL(iter->filesystem_url()); |
if (!policy->CanReadFileSystemFile(child_id, url)) { |
NOTREACHED() << "Denied unauthorized upload of " |
@@ -299,7 +299,7 @@ bool IsValidatedSCT( |
return sct_status.status == net::ct::SCT_STATUS_OK; |
} |
-webkit_blob::BlobStorageContext* GetBlobStorageContext( |
+storage::BlobStorageContext* GetBlobStorageContext( |
ResourceMessageFilter* filter) { |
if (!filter->blob_storage_context()) |
return NULL; |
@@ -543,7 +543,7 @@ DownloadInterruptReason ResourceDispatcherHostImpl::BeginDownload( |
if (request->url().SchemeIs(url::kBlobScheme)) { |
ChromeBlobStorageContext* blob_context = |
GetChromeBlobStorageContextForResourceContext(context); |
- webkit_blob::BlobProtocolHandler::SetRequestedBlobDataHandle( |
+ storage::BlobProtocolHandler::SetRequestedBlobDataHandle( |
request.get(), |
blob_context->context()->GetBlobDataFromPublicURL(request->url())); |
} |
@@ -1087,10 +1087,10 @@ void ResourceDispatcherHostImpl::BeginRequest( |
if (new_request->url().SchemeIs(url::kBlobScheme)) { |
// Hang on to a reference to ensure the blob is not released prior |
// to the job being started. |
- webkit_blob::BlobProtocolHandler::SetRequestedBlobDataHandle( |
+ storage::BlobProtocolHandler::SetRequestedBlobDataHandle( |
new_request.get(), |
- filter_->blob_storage_context()->context()-> |
- GetBlobDataFromPublicURL(new_request->url())); |
+ filter_->blob_storage_context()->context()->GetBlobDataFromPublicURL( |
+ new_request->url())); |
} |
// Initialize the service worker handler for the request. |