Use the request URL as the URL of the resources which are fetched ServiceWorker [2/3 chromium]

1/3 blink: https://codereview.chromium.org/732963003
 - Intorduce originalURLViaServiceWorker in ResourceResponse and WebURLResponse
 - Change CSP check to use originalURLViaServiceWorker if exists in ResourceFetcher::didReceiveResponse().
2/3 chromium: https://codereview.chromium.org/731983003 [THIS PATCH]
 - Stop updating the request's URL in ResourceDispatcher::OnReceivedResponse() and WebURLLoaderImpl::Context::OnReceivedResponse().
 - Set WebURLResponse's originalURLViaServiceWorker in WebURLLoaderImpl::PopulateURLResponse().
3/3 blink: https://codereview.chromium.org/732003002
 - Change CSP check to use originalURLViaServiceWorker.
 - Add LayoutTest for this bug.

BUG=433743

Review URL: https://codereview.chromium.org/731983003

Cr-Commit-Position: refs/heads/master@{#305075}

1 files changed, 3 insertions, 6 deletions

diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc
index 949a3cf..00fc99a 100644
--- a/content/child/web_url_loader_impl.cc
+++ b/content/child/web_url_loader_impl.cc
@@ -629,12 +629,6 @@ void WebURLLoaderImpl::Context::OnReceivedResponse(
 
   WebURLResponse response;
   response.initialize();
-  // Updates the request url if the response was fetched by a ServiceWorker,
-  // and it was not generated inside the ServiceWorker.
-  if (info.was_fetched_via_service_worker &&
-      !info.original_url_via_service_worker.is_empty()) {
-    request_.setURL(info.original_url_via_service_worker);
-  }
   PopulateURLResponse(request_.url(), info, &response);
 
   bool show_raw_listing = (GURL(request_.url()).query() == "raw");
@@ -1017,6 +1011,9 @@ void WebURLLoaderImpl::PopulateURLResponse(const GURL& url,
   response->setWasFallbackRequiredByServiceWorker(
       info.was_fallback_required_by_service_worker);
   response->setServiceWorkerResponseType(info.response_type_via_service_worker);
+  response->setOriginalURLViaServiceWorker(
+      info.original_url_via_service_worker);
+
   WebURLResponseExtraDataImpl* extra_data =
       new WebURLResponseExtraDataImpl(info.npn_negotiated_protocol);
   response->setExtraData(extra_data);