Commit 3d493dc6 authored by Kenichi Ishibashi's avatar Kenichi Ishibashi Committed by Commit Bot

Remove unnecessary NetworkService flag check in ResourceDispatcher

blink::ServiceWorkerUtils::IsServicificationEnabled() checks
whether NetworkService is enabled, so we don't need the check
in ResourceDispatcher::StartAsync().

Bug: N/A
Change-Id: I06bab175489f42dc0cefa2a257806db29192eba1
Reviewed-on: https://chromium-review.googlesource.com/1168707Reviewed-by: default avatarMakoto Shimazu <shimazu@chromium.org>
Reviewed-by: default avatarYutaka Hirano <yhirano@chromium.org>
Commit-Queue: Kenichi Ishibashi <bashi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581828}
parent c8299015
...@@ -722,8 +722,7 @@ int ResourceDispatcher::StartAsync( ...@@ -722,8 +722,7 @@ int ResourceDispatcher::StartAsync(
uint32_t options = network::mojom::kURLLoadOptionNone; uint32_t options = network::mojom::kURLLoadOptionNone;
// TODO(jam): use this flag for ResourceDispatcherHost code path once // TODO(jam): use this flag for ResourceDispatcherHost code path once
// MojoLoading is the only IPC code path. // MojoLoading is the only IPC code path.
if ((blink::ServiceWorkerUtils::IsServicificationEnabled() || if (blink::ServiceWorkerUtils::IsServicificationEnabled() &&
base::FeatureList::IsEnabled(network::features::kNetworkService)) &&
request->fetch_request_context_type != REQUEST_CONTEXT_TYPE_FETCH) { request->fetch_request_context_type != REQUEST_CONTEXT_TYPE_FETCH) {
// MIME sniffing should be disabled for a request initiated by fetch(). // MIME sniffing should be disabled for a request initiated by fetch().
options |= network::mojom::kURLLoadOptionSniffMimeType; options |= network::mojom::kURLLoadOptionSniffMimeType;
......
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