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

Source/core/fetch/ResourceFetcher.cpp

Index: Source/core/fetch/ResourceFetcher.cpp
diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
index 67b9d6f6f1a797358ab34b1838a63d92386056da..3f4817a2e7c9b1d248b2a5010f83f5139c411abc 100644
--- a/Source/core/fetch/ResourceFetcher.cpp
+++ b/Source/core/fetch/ResourceFetcher.cpp
@@ -1349,10 +1349,7 @@ void ResourceFetcher::didReceiveResponse(const Resource* resource, const Resourc
 
     // If the response is fetched via ServiceWorker, the original URL of the response could be different from the URL of the request.

[yhirano, 2014/11/19 04:06:21]

Can you add a comment here that this check aims not to fetch a resource that are
forbidden by the page CSP even in the service worker, and it is not specified
currently?

[horo, 2014/11/19 04:55:59]

Done.

     if (response.wasFetchedViaServiceWorker()) {
-        KURL originalURL = response.url();
-        // FIXME: Use response.originalURLViaServiceWorker() after the chromium side patch will land.
-        if (!response.originalURLViaServiceWorker().isEmpty())
-            originalURL = response.originalURLViaServiceWorker();
+        const KURL& originalURL = response.originalURLViaServiceWorker();
         if (!canRequest(resource->type(), resource->resourceRequest(), originalURL, resource->options(), false, FetchRequest::UseDefaultOriginRestrictionForType)) {
             resource->loader()->cancel();
             bool isInternalRequest = resource->options().initiatorInfo.name == FetchInitiatorTypeNames::internal;