| Index: storage/browser/blob/blob_url_request_job_factory.cc
|
| diff --git a/webkit/browser/blob/blob_url_request_job_factory.cc b/storage/browser/blob/blob_url_request_job_factory.cc
|
| similarity index 72%
|
| rename from webkit/browser/blob/blob_url_request_job_factory.cc
|
| rename to storage/browser/blob/blob_url_request_job_factory.cc
|
| index 73efe4c21a4275162fac8d369980cbb4f71206b8..8d4bfb66d9e4f507f7f10340a3f6d6a41cbf7618 100644
|
| --- a/webkit/browser/blob/blob_url_request_job_factory.cc
|
| +++ b/storage/browser/blob/blob_url_request_job_factory.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/browser/blob/blob_url_request_job_factory.h"
|
| +#include "storage/browser/blob/blob_url_request_job_factory.h"
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| @@ -11,12 +11,12 @@
|
| #include "net/base/request_priority.h"
|
| #include "net/url_request/url_request_context.h"
|
| #include "net/url_request/url_request_job_factory.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.h"
|
| -#include "webkit/browser/fileapi/file_system_context.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.h"
|
| +#include "storage/browser/fileapi/file_system_context.h"
|
|
|
| -namespace webkit_blob {
|
| +namespace storage {
|
|
|
| namespace {
|
|
|
| @@ -49,10 +49,9 @@ void BlobProtocolHandler::SetRequestedBlobDataHandle(
|
|
|
| BlobProtocolHandler::BlobProtocolHandler(
|
| BlobStorageContext* context,
|
| - fileapi::FileSystemContext* file_system_context,
|
| + storage::FileSystemContext* file_system_context,
|
| base::MessageLoopProxy* loop_proxy)
|
| - : file_system_context_(file_system_context),
|
| - file_loop_proxy_(loop_proxy) {
|
| + : file_system_context_(file_system_context), file_loop_proxy_(loop_proxy) {
|
| if (context)
|
| context_ = context->AsWeakPtr();
|
| }
|
| @@ -61,14 +60,17 @@ BlobProtocolHandler::~BlobProtocolHandler() {
|
| }
|
|
|
| net::URLRequestJob* BlobProtocolHandler::MaybeCreateJob(
|
| - net::URLRequest* request, net::NetworkDelegate* network_delegate) const {
|
| - return new webkit_blob::BlobURLRequestJob(
|
| - request, network_delegate, LookupBlobData(request),
|
| - file_system_context_, file_loop_proxy_);
|
| + net::URLRequest* request,
|
| + net::NetworkDelegate* network_delegate) const {
|
| + return new storage::BlobURLRequestJob(request,
|
| + network_delegate,
|
| + LookupBlobData(request),
|
| + file_system_context_,
|
| + file_loop_proxy_);
|
| }
|
|
|
| -scoped_refptr<webkit_blob::BlobData>
|
| -BlobProtocolHandler::LookupBlobData(net::URLRequest* request) const {
|
| +scoped_refptr<storage::BlobData> BlobProtocolHandler::LookupBlobData(
|
| + net::URLRequest* request) const {
|
| BlobDataHandle* blob_data_handle = GetRequestedBlobDataHandle(request);
|
| if (blob_data_handle)
|
| return blob_data_handle->data();
|
| @@ -86,4 +88,4 @@ BlobProtocolHandler::LookupBlobData(net::URLRequest* request) const {
|
| return handle.get() ? handle->data() : NULL;
|
| }
|
|
|
| -} // namespace webkit_blob
|
| +} // namespace storage
|
|
|