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 08bf5773cf678a2afd74e9fd0a26891f3b54e82d..a23dcfe1dfcbf36b8f7691ab77fe2bb72fdd78b8 100644 |
--- a/content/browser/loader/resource_dispatcher_host_impl.cc |
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc |
@@ -310,6 +310,13 @@ bool IsValidatedSCT( |
return sct_status.status == net::ct::SCT_STATUS_OK; |
} |
+webkit_blob::BlobStorageContext* GetBlobStorageContext( |
michaeln
2014/05/23 02:23:23
might make this helper take filter_ as input since
falken
2014/05/23 11:15:46
yea that's a better, done
|
+ ChromeBlobStorageContext* context) { |
+ if (!context) |
+ return NULL; |
+ return context->context(); |
+} |
+ |
} // namespace |
// static |
@@ -1050,9 +1057,8 @@ void ResourceDispatcherHostImpl::BeginRequest( |
// Resolve elements from request_body and prepare upload data. |
if (request_data.request_body.get()) { |
- webkit_blob::BlobStorageContext* blob_context = NULL; |
- if (filter_->blob_storage_context()) |
- blob_context = filter_->blob_storage_context()->context(); |
+ webkit_blob::BlobStorageContext* blob_context = |
+ GetBlobStorageContext(filter_->blob_storage_context()); |
new_request->set_upload(UploadDataStreamBuilder::Build( |
request_data.request_body.get(), |
blob_context, |
@@ -1104,6 +1110,7 @@ void ResourceDispatcherHostImpl::BeginRequest( |
ServiceWorkerRequestHandler::InitializeHandler( |
new_request.get(), |
filter_->service_worker_context(), |
+ GetBlobStorageContext(filter_->blob_storage_context()), |
child_id, |
request_data.service_worker_provider_id, |
request_data.resource_type); |