| 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 59124440b5ddb794867c195d3c91a1c37de51059..3490a772e603a233811e7e5db32bfc5fc34920c4 100644
|
| --- a/content/browser/loader/resource_dispatcher_host_impl.cc
|
| +++ b/content/browser/loader/resource_dispatcher_host_impl.cc
|
| @@ -1873,7 +1873,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
|
| ResourceContext* resource_context,
|
| int frame_tree_node_id,
|
| const NavigationRequestInfo& info,
|
| - NavigationURLLoaderImplCore* loader) {
|
| + NavigationURLLoaderImplCore* loader,
|
| + ServiceWorkerContextWrapper* service_worker_context) {
|
| // PlzNavigate: BeginNavigationRequest currently should only be used for the
|
| // browser-side navigations project.
|
| CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| @@ -1938,10 +1939,10 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
|
|
|
| new_request->SetLoadFlags(load_flags);
|
|
|
| + storage::BlobStorageContext* blob_context = GetBlobStorageContext(
|
| + GetChromeBlobStorageContextForResourceContext(resource_context));
|
| // Resolve elements from request_body and prepare upload data.
|
| if (info.request_body.get()) {
|
| - storage::BlobStorageContext* blob_context = GetBlobStorageContext(
|
| - GetChromeBlobStorageContextForResourceContext(resource_context));
|
| AttachRequestBodyBlobDataHandles(
|
| info.request_body.get(),
|
| blob_context);
|
| @@ -2006,6 +2007,13 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
|
| blob_context->context()->GetBlobDataFromPublicURL(new_request->url()));
|
| }
|
|
|
| + ServiceWorkerRequestHandler::InitializeNavigationHandler(
|
| + new_request.get(), service_worker_context, blob_context,
|
| + false, // TODO(horo): Add skip_service_worker to NavigationRequestInfo.
|
| + info.is_main_frame, // RESOURCE_TYPE_MAIN_FRAME or
|
| + // RESOURCE_TYPE_SUB_FRAME
|
| + info.request_body, loader);
|
| +
|
| // TODO(davidben): Attach ServiceWorkerRequestHandler.
|
| // TODO(michaeln): Help out with this and that.
|
| // TODO(davidben): Attach AppCacheInterceptor.
|
|
|