[ServiceWorker] Fetch event should return integrity value

content/browser/service_worker/service_worker_request_handler.cc

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 f27f24201937655c5d215253b390b93a0a6607ad..e73b0f02e6fcfbc3533e07b8cb6a98c9fc5298c6 100644
--- a/content/browser/service_worker/service_worker_request_handler.cc
+++ b/content/browser/service_worker/service_worker_request_handler.cc
@@ -100,9 +100,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, "" /*integrity*/, resource_type,

[shimazu, 2017/07/06 07:47:06]

Just confirmation; Is this okay to pass a blank string when navigation?

[xiaofengzhang, 2017/07/06 08:00:25]

maybe its safe to use std::string()?

[shimazu, 2017/07/06 08:14:23]

Ah, sorry, my question was to confirm if just passing an empty string as the
integrity attribute of the main resource is correct. I reminded    it's the same
with the previous behavior, so please ignore that :)

+          request_context_type, frame_type, blob_storage_context->AsWeakPtr(),
+          body, skip_service_worker));
   if (handler)
     request->SetUserData(&kUserDataKey, std::move(handler));
 
@@ -155,9 +155,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, "" /*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
@@ -179,6 +179,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,
@@ -202,9 +203,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));
 }