| Index: content/browser/service_worker/service_worker_url_request_job.cc
|
| diff --git a/content/browser/service_worker/service_worker_url_request_job.cc b/content/browser/service_worker/service_worker_url_request_job.cc
|
| index fd101a08cb57128b124537191a95991a80c15d46..34335a38d57981146867c818d69da0d4df9eaa24 100644
|
| --- a/content/browser/service_worker/service_worker_url_request_job.cc
|
| +++ b/content/browser/service_worker/service_worker_url_request_job.cc
|
| @@ -16,9 +16,9 @@
|
| #include "net/http/http_response_headers.h"
|
| #include "net/http/http_response_info.h"
|
| #include "net/http/http_util.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 "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"
|
|
|
| namespace content {
|
|
|
| @@ -26,7 +26,7 @@ ServiceWorkerURLRequestJob::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)
|
| : net::URLRequestJob(request, network_delegate),
|
| provider_host_(provider_host),
|
| response_type_(NOT_DETERMINED),
|
| @@ -263,14 +263,14 @@ void ServiceWorkerURLRequestJob::DidDispatchFetchEvent(
|
|
|
| // Set up a request for reading the blob.
|
| if (!response.blob_uuid.empty() && blob_storage_context_) {
|
| - scoped_ptr<webkit_blob::BlobDataHandle> blob_data_handle =
|
| + scoped_ptr<storage::BlobDataHandle> blob_data_handle =
|
| blob_storage_context_->GetBlobDataFromUUID(response.blob_uuid);
|
| if (!blob_data_handle) {
|
| // The renderer gave us a bad blob UUID.
|
| DeliverErrorResponse();
|
| return;
|
| }
|
| - blob_request_ = webkit_blob::BlobProtocolHandler::CreateBlobRequest(
|
| + blob_request_ = storage::BlobProtocolHandler::CreateBlobRequest(
|
| blob_data_handle.Pass(), request()->context(), this);
|
| blob_request_->Start();
|
| }
|
|
|