Deprecate ResourceType in worker_host

As blink::mojom::ResourceType is deprecated[1], this CL uses
network::mojom::RequestDestination in
DedicatedWorkerHost, SharedWorkerServiceImpl,
WorkerScriptFetchInitiator, and
WorkerScriptLoaderFactory.

[1] https://crbug.com/960143

Bug: 1059639
Change-Id: Idfc79101e4c9fde230aa4f06ce24964f3a84c0c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2524819Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#825602}

content/browser/worker_host/dedicated_worker_host.cc

@@ -31,6 +31,7 @@
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "net/base/isolation_info.h"
 #include "services/metrics/public/cpp/ukm_source_id.h"
+#include "services/network/public/mojom/fetch_api.mojom.h"
 #include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/common/tokens/tokens.h"
 #include "third_party/blink/public/mojom/loader/fetch_client_settings_object.mojom.h"
@@ -196,7 +197,7 @@ void DedicatedWorkerHost::StartScriptLoad(
       creator_origin_,
       nearest_ancestor_render_frame_host->GetIsolationInfoForSubresources(),
       credentials_mode, std::move(outside_fetch_client_settings_object),
-      blink::mojom::ResourceType::kWorker,
+      network::mojom::RequestDestination::kWorker,
       storage_partition_impl->GetServiceWorkerContext(),
       service_worker_handle_.get(),
       appcache_host ? appcache_host->GetWeakPtr() : nullptr,

content/browser/worker_host/shared_worker_service_impl.cc

@@ -330,11 +330,12 @@ SharedWorkerHost* SharedWorkerServiceImpl::CreateWorker(
           net::IsolationInfo::RequestType::kOther, worker_origin, worker_origin,
           net::SiteForCookies::FromOrigin(worker_origin)),
       credentials_mode, std::move(outside_fetch_client_settings_object),
-      blink::mojom::ResourceType::kSharedWorker, service_worker_context_,
-      service_worker_handle_raw, std::move(appcache_host),
-      std::move(blob_url_loader_factory), url_loader_factory_override_,
-      storage_partition_, storage_domain, host->ukm_source_id(),
-      SharedWorkerDevToolsAgentHost::GetFor(host), host->GetDevToolsToken(),
+      network::mojom::RequestDestination::kSharedWorker,
+      service_worker_context_, service_worker_handle_raw,
+      std::move(appcache_host), std::move(blob_url_loader_factory),
+      url_loader_factory_override_, storage_partition_, storage_domain,
+      host->ukm_source_id(), SharedWorkerDevToolsAgentHost::GetFor(host),
+      host->GetDevToolsToken(),
       base::BindOnce(&SharedWorkerServiceImpl::StartWorker,
                      weak_factory_.GetWeakPtr(), weak_host, message_port,
                      std::move(cloned_outside_fetch_client_settings_object)));

content/browser/worker_host/worker_script_fetch_initiator.cc

@@ -51,7 +51,6 @@
 #include "services/metrics/public/cpp/ukm_source_id.h"
 #include "services/network/public/cpp/constants.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
-#include "services/network/public/mojom/fetch_api.mojom.h"
 #include "third_party/blink/public/common/loader/url_loader_factory_bundle.h"
 #include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
 #include "third_party/blink/public/mojom/service_worker/service_worker_provider.mojom.h"
@@ -71,7 +70,7 @@ void WorkerScriptFetchInitiator::Start(
     network::mojom::CredentialsMode credentials_mode,
     blink::mojom::FetchClientSettingsObjectPtr
         outside_fetch_client_settings_object,
-    blink::mojom::ResourceType resource_type,
+    network::mojom::RequestDestination request_destination,
     scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
     ServiceWorkerMainResourceHandle* service_worker_handle,
     base::WeakPtr<AppCacheHost> appcache_host,
@@ -85,9 +84,10 @@ void WorkerScriptFetchInitiator::Start(
     CompletionCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(storage_partition);
-  DCHECK(resource_type == blink::mojom::ResourceType::kWorker ||
-         resource_type == blink::mojom::ResourceType::kSharedWorker)
-      << static_cast<int>(resource_type);
+  DCHECK(request_destination == network::mojom::RequestDestination::kWorker ||
+         request_destination ==
+             network::mojom::RequestDestination::kSharedWorker)
+      << static_cast<int>(request_destination);
 
   BrowserContext* browser_context = storage_partition->browser_context();
   ResourceContext* resource_context =
@@ -103,7 +103,7 @@ void WorkerScriptFetchInitiator::Start(
   // TODO(https://crbug.com/987517): Filesystem URL support on shared workers
   // are now broken.
   bool filesystem_url_support =
-      resource_type == blink::mojom::ResourceType::kWorker;
+      request_destination == network::mojom::RequestDestination::kWorker;
 
   // Set up the factory bundle for non-NetworkService URLs, e.g.,
   // chrome-extension:// URLs. One factory bundle is consumed by the browser
@@ -138,7 +138,7 @@ void WorkerScriptFetchInitiator::Start(
   resource_request->referrer = sanitized_referrer.url,
   resource_request->referrer_policy = Referrer::ReferrerPolicyForUrlRequest(
       outside_fetch_client_settings_object->referrer_policy);
-  resource_request->resource_type = static_cast<int>(resource_type);
+  resource_request->destination = request_destination;
   resource_request->credentials_mode = credentials_mode;
   if (creator_render_frame_host) {
     resource_request->render_frame_id =
@@ -156,17 +156,17 @@ void WorkerScriptFetchInitiator::Start(
   // module fetch flag is set, then set request's mode to "same-origin"."
   resource_request->mode = network::mojom::RequestMode::kSameOrigin;
 
-  switch (resource_type) {
-    case blink::mojom::ResourceType::kWorker:
-      resource_request->destination =
-          network::mojom::RequestDestination::kWorker;
+  switch (request_destination) {
+    case network::mojom::RequestDestination::kWorker:
+      resource_request->resource_type =
+          static_cast<int>(blink::mojom::ResourceType::kWorker);
       break;
-    case blink::mojom::ResourceType::kSharedWorker:
-      resource_request->destination =
-          network::mojom::RequestDestination::kSharedWorker;
+    case network::mojom::RequestDestination::kSharedWorker:
+      resource_request->resource_type =
+          static_cast<int>(blink::mojom::ResourceType::kSharedWorker);
       break;
     default:
-      NOTREACHED() << static_cast<int>(resource_type);
+      NOTREACHED() << static_cast<int>(request_destination);
       break;
   }
 

content/browser/worker_host/worker_script_fetch_initiator.h

@@ -79,7 +79,7 @@ class CONTENT_EXPORT WorkerScriptFetchInitiator {
       network::mojom::CredentialsMode credentials_mode,
       blink::mojom::FetchClientSettingsObjectPtr
           outside_fetch_client_settings_object,
-      blink::mojom::ResourceType resource_type,
+      network::mojom::RequestDestination request_destination,
       scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
       ServiceWorkerMainResourceHandle* service_worker_handle,
       base::WeakPtr<AppCacheHost> appcache_host,

content/browser/worker_host/worker_script_loader_factory.cc

@@ -16,6 +16,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
+#include "services/network/public/mojom/fetch_api.mojom.h"
 #include "third_party/blink/public/mojom/service_worker/service_worker_container_type.mojom.h"
 
 namespace content {
@@ -54,11 +55,11 @@ void WorkerScriptLoaderFactory::CreateLoaderAndStart(
     mojo::PendingRemote<network::mojom::URLLoaderClient> client,
     const net::MutableNetworkTrafficAnnotationTag& traffic_annotation) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  DCHECK(resource_request.resource_type ==
-             static_cast<int>(blink::mojom::ResourceType::kWorker) ||
-         resource_request.resource_type ==
-             static_cast<int>(blink::mojom::ResourceType::kSharedWorker))
-      << resource_request.resource_type;
+  DCHECK(resource_request.destination ==
+             network::mojom::RequestDestination::kWorker ||
+         resource_request.destination ==
+             network::mojom::RequestDestination::kSharedWorker)
+      << resource_request.destination;
   DCHECK(!script_loader_);
 
   // Create a WorkerScriptLoader to load the script.