| Index: content/browser/storage_partition_impl_map.cc
|
| ===================================================================
|
| --- content/browser/storage_partition_impl_map.cc (revision 171309)
|
| +++ content/browser/storage_partition_impl_map.cc (working copy)
|
| @@ -33,42 +33,18 @@
|
| #include "net/url_request/url_request_context.h"
|
| #include "webkit/appcache/view_appcache_internals_job.h"
|
| #include "webkit/blob/blob_data.h"
|
| +#include "webkit/blob/blob_storage_context.h"
|
| #include "webkit/blob/blob_url_request_job_factory.h"
|
| #include "webkit/fileapi/file_system_url_request_job_factory.h"
|
|
|
| using appcache::AppCacheService;
|
| using fileapi::FileSystemContext;
|
| -using webkit_blob::BlobStorageController;
|
| +using webkit_blob::BlobStorageContext;
|
|
|
| namespace content {
|
|
|
| namespace {
|
|
|
| -class BlobProtocolHandler : public webkit_blob::BlobProtocolHandler {
|
| - public:
|
| - BlobProtocolHandler(
|
| - webkit_blob::BlobStorageController* blob_storage_controller,
|
| - fileapi::FileSystemContext* file_system_context,
|
| - base::MessageLoopProxy* loop_proxy)
|
| - : webkit_blob::BlobProtocolHandler(blob_storage_controller,
|
| - file_system_context,
|
| - loop_proxy) {}
|
| -
|
| - virtual ~BlobProtocolHandler() {}
|
| -
|
| - private:
|
| - virtual scoped_refptr<webkit_blob::BlobData>
|
| - LookupBlobData(net::URLRequest* request) const {
|
| - const ResourceRequestInfoImpl* info =
|
| - ResourceRequestInfoImpl::ForRequest(request);
|
| - if (!info)
|
| - return NULL;
|
| - return info->requested_blob_data();
|
| - }
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(BlobProtocolHandler);
|
| -};
|
| -
|
| // Adds a bunch of debugging urls. We use an interceptor instead of a protocol
|
| // handler because we want to reuse the chrome://scheme (everyone is familiar
|
| // with it, and no need to expose the content/chrome separation through our UI).
|
| @@ -77,9 +53,9 @@
|
| public:
|
| DeveloperProtocolHandler(
|
| AppCacheService* appcache_service,
|
| - BlobStorageController* blob_storage_controller)
|
| + BlobStorageContext* blob_storage_context)
|
| : appcache_service_(appcache_service),
|
| - blob_storage_controller_(blob_storage_controller) {}
|
| + blob_storage_context_(blob_storage_context) {}
|
| virtual ~DeveloperProtocolHandler() {}
|
|
|
| virtual net::URLRequestJob* MaybeIntercept(
|
| @@ -97,11 +73,11 @@
|
| request, network_delegate, appcache_service_);
|
| }
|
|
|
| - // Next check for chrome://blob-internals/, which uses its own job type.
|
| - if (ViewBlobInternalsJobFactory::IsSupportedURL(request->url())) {
|
| - return ViewBlobInternalsJobFactory::CreateJobForRequest(
|
| - request, network_delegate, blob_storage_controller_);
|
| - }
|
| + //// Next check for chrome://blob-internals/, which uses its own job type.
|
| + //if (ViewBlobInternalsJobFactory::IsSupportedURL(request->url())) {
|
| + // return ViewBlobInternalsJobFactory::CreateJobForRequest(
|
| + // request, network_delegate, blob_storage_controller_);
|
| + //}
|
|
|
| #if defined(USE_TCMALLOC)
|
| // Next check for chrome://tcmalloc/, which uses its own job type.
|
| @@ -139,7 +115,7 @@
|
|
|
| private:
|
| AppCacheService* appcache_service_;
|
| - BlobStorageController* blob_storage_controller_;
|
| + BlobStorageContext* blob_storage_context_;
|
| };
|
|
|
| void InitializeURLRequestContext(
|
| @@ -171,8 +147,8 @@
|
|
|
| bool set_protocol = job_factory->SetProtocolHandler(
|
| chrome::kBlobScheme,
|
| - new BlobProtocolHandler(
|
| - blob_storage_context->controller(),
|
| + new webkit_blob::BlobProtocolHandler(
|
| + blob_storage_context->context(),
|
| file_system_context,
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)));
|
| DCHECK(set_protocol);
|
| @@ -183,7 +159,7 @@
|
|
|
| job_factory->AddInterceptor(
|
| new DeveloperProtocolHandler(appcache_service,
|
| - blob_storage_context->controller()));
|
| + blob_storage_context->context()));
|
|
|
| // TODO(jam): Add the ProtocolHandlerRegistryIntercepter here!
|
| }
|
|
|