Commit 6abf93f5 authored by Matt Falkenhagen's avatar Matt Falkenhagen Committed by Commit Bot

service worker: Remove ServiceWorkerNewScriptLoader::resource_request_.

It is not used beyond the constructor.

Change-Id: Id764b8c6889075977ffae3bde8b170871f7ab350
Reviewed-on: https://chromium-review.googlesource.com/1060773Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Matt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#560947}
parent e4436944
......@@ -39,7 +39,6 @@ ServiceWorkerNewScriptLoader::ServiceWorkerNewScriptLoader(
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation)
: request_url_(original_request.url),
resource_type_(static_cast<ResourceType>(original_request.resource_type)),
resource_request_(new network::ResourceRequest(original_request)),
version_(version),
network_client_binding_(this),
network_watcher_(FROM_HERE,
......@@ -48,6 +47,8 @@ ServiceWorkerNewScriptLoader::ServiceWorkerNewScriptLoader(
loader_factory_(std::move(loader_factory)),
client_(std::move(client)),
weak_factory_(this) {
network::ResourceRequest resource_request(original_request);
// ServiceWorkerNewScriptLoader is used for fetching the service worker main
// script (RESOURCE_TYPE_SERVICE_WORKER) during worker startup or
// importScripts() (RESOURCE_TYPE_SCRIPT).
......@@ -88,7 +89,7 @@ ServiceWorkerNewScriptLoader::ServiceWorkerNewScriptLoader(
if (ServiceWorkerUtils::ShouldBypassCacheDueToUpdateViaCache(
is_main_script, registration->update_via_cache()))
resource_request_->load_flags |= net::LOAD_BYPASS_CACHE;
resource_request.load_flags |= net::LOAD_BYPASS_CACHE;
// Create response readers only when we have to do the byte-for-byte check.
std::unique_ptr<ServiceWorkerResponseReader> compare_reader;
......@@ -106,15 +107,15 @@ ServiceWorkerNewScriptLoader::ServiceWorkerNewScriptLoader(
cache_resource_id);
AdvanceState(State::kStarted);
// Disable MIME sniffing sniffing. The spec requires the header list to have
// a JavaScript MIME type. Therefore, no sniffing is needed.
// Disable MIME sniffing. The spec requires the header list to have a
// JavaScript MIME type. Therefore, no sniffing is needed.
options &= ~network::mojom::kURLLoadOptionSniffMimeType;
network::mojom::URLLoaderClientPtr network_client;
network_client_binding_.Bind(mojo::MakeRequest(&network_client));
loader_factory_->CreateLoaderAndStart(
mojo::MakeRequest(&network_loader_), routing_id, request_id, options,
*resource_request_.get(), std::move(network_client), traffic_annotation);
resource_request, std::move(network_client), traffic_annotation);
}
ServiceWorkerNewScriptLoader::~ServiceWorkerNewScriptLoader() = default;
......
......@@ -136,8 +136,6 @@ class CONTENT_EXPORT ServiceWorkerNewScriptLoader
// RESOURCE_TYPE_SCRIPT for an imported script.
const ResourceType resource_type_;
std::unique_ptr<network::ResourceRequest> resource_request_;
scoped_refptr<ServiceWorkerVersion> version_;
std::unique_ptr<ServiceWorkerCacheWriter> cache_writer_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment