| Index: content/browser/service_worker/service_worker_request_handler.cc
|
| diff --git a/content/browser/service_worker/service_worker_request_handler.cc b/content/browser/service_worker/service_worker_request_handler.cc
|
| index df8b6fcc7d6cb10366246eaaf780eb2f9c414426..50948a4ca041b5ccf54dcd93c429ab1700c8bd66 100644
|
| --- a/content/browser/service_worker/service_worker_request_handler.cc
|
| +++ b/content/browser/service_worker/service_worker_request_handler.cc
|
| @@ -102,9 +102,9 @@ void ServiceWorkerRequestHandler::InitializeForNavigation(
|
| std::unique_ptr<ServiceWorkerRequestHandler> handler(
|
| provider_host->CreateRequestHandler(
|
| FETCH_REQUEST_MODE_NAVIGATE, FETCH_CREDENTIALS_MODE_INCLUDE,
|
| - FetchRedirectMode::MANUAL_MODE, resource_type, request_context_type,
|
| - frame_type, blob_storage_context->AsWeakPtr(), body,
|
| - skip_service_worker));
|
| + FetchRedirectMode::MANUAL_MODE, std::string() /* integrity */,
|
| + resource_type, request_context_type, frame_type,
|
| + blob_storage_context->AsWeakPtr(), body, skip_service_worker));
|
| if (handler)
|
| request->SetUserData(&kUserDataKey, std::move(handler));
|
|
|
| @@ -156,9 +156,9 @@ ServiceWorkerRequestHandler::InitializeForNavigationNetworkService(
|
| std::unique_ptr<ServiceWorkerRequestHandler> handler(
|
| provider_host->CreateRequestHandler(
|
| FETCH_REQUEST_MODE_NAVIGATE, FETCH_CREDENTIALS_MODE_INCLUDE,
|
| - FetchRedirectMode::MANUAL_MODE, resource_type, request_context_type,
|
| - frame_type, blob_storage_context->AsWeakPtr(), body,
|
| - skip_service_worker));
|
| + FetchRedirectMode::MANUAL_MODE, std::string() /* integrity */,
|
| + resource_type, request_context_type, frame_type,
|
| + blob_storage_context->AsWeakPtr(), body, skip_service_worker));
|
|
|
| // Transfer ownership to the ServiceWorkerNavigationHandleCore.
|
| // In the case of a successful navigation, the SWProviderHost will be
|
| @@ -180,6 +180,7 @@ void ServiceWorkerRequestHandler::InitializeHandler(
|
| FetchRequestMode request_mode,
|
| FetchCredentialsMode credentials_mode,
|
| FetchRedirectMode redirect_mode,
|
| + const std::string& integrity,
|
| ResourceType resource_type,
|
| RequestContextType request_context_type,
|
| RequestContextFrameType frame_type,
|
| @@ -203,9 +204,9 @@ void ServiceWorkerRequestHandler::InitializeHandler(
|
|
|
| std::unique_ptr<ServiceWorkerRequestHandler> handler(
|
| provider_host->CreateRequestHandler(
|
| - request_mode, credentials_mode, redirect_mode, resource_type,
|
| - request_context_type, frame_type, blob_storage_context->AsWeakPtr(),
|
| - body, skip_service_worker));
|
| + request_mode, credentials_mode, redirect_mode, integrity,
|
| + resource_type, request_context_type, frame_type,
|
| + blob_storage_context->AsWeakPtr(), body, skip_service_worker));
|
| if (handler)
|
| request->SetUserData(&kUserDataKey, std::move(handler));
|
| }
|
|
|