Remove RunOrPostTaskOnCoreThread for EWI::CreateFactoryBundles

This is a clean up task after ServiceWorkerOnUI.
EmbeddedWorkerInstance::CreateFactoryBundles() now returns the parameters
without callbacks.

Bug: 1138155
Change-Id: Ifc896fb6c1c3e8d897f7d9ca1abed6fa5ddd9c41
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2576962
Commit-Queue: Makoto Shimazu <shimazu@chromium.org>
Reviewed-by: Asami Doi <asamidoi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835092}

content/browser/service_worker/embedded_worker_instance.h

@@ -244,10 +244,15 @@ class CONTENT_EXPORT EmbeddedWorkerInstance
 
   // Creates a set of factory bundles for scripts and subresources. This must be
   // called after the COEP value for the worker script is known.
-  using CreateFactoryBundlesCallback = base::OnceCallback<void(
-      std::unique_ptr<blink::PendingURLLoaderFactoryBundle> script_bundle,
-      std::unique_ptr<blink::PendingURLLoaderFactoryBundle> subresouce_bundle)>;
-  void CreateFactoryBundles(CreateFactoryBundlesCallback callback);
+  struct CreateFactoryBundlesResult {
+    CreateFactoryBundlesResult();
+    ~CreateFactoryBundlesResult();
+    CreateFactoryBundlesResult(CreateFactoryBundlesResult&& other);
+
+    std::unique_ptr<blink::PendingURLLoaderFactoryBundle> script_bundle;
+    std::unique_ptr<blink::PendingURLLoaderFactoryBundle> subresource_bundle;
+  };
+  CreateFactoryBundlesResult CreateFactoryBundles();
 
   // Returns the unique token that has been generated to identify this worker
   // instance, and its corresponding GlobalScope in the renderer process. If the
@@ -330,15 +335,6 @@ class CONTENT_EXPORT EmbeddedWorkerInstance
 
   void BindCacheStorageInternal();
 
-  void OnCreatedFactoryBundles(
-      CreateFactoryBundlesCallback callback,
-      std::unique_ptr<blink::PendingURLLoaderFactoryBundle> script_bundle,
-      std::unique_ptr<blink::PendingURLLoaderFactoryBundle> subresouce_bundle,
-      mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter>
-          coep_reporter,
-      mojo::PendingReceiver<blink::mojom::ReportingObserver>
-          reporting_observer_receiver);
-
   base::WeakPtr<ServiceWorkerContextCore> context_;
   ServiceWorkerVersion* owner_version_;
 

content/browser/service_worker/service_worker_version.cc

@@ -1009,9 +1009,10 @@ void ServiceWorkerVersion::OnMainScriptLoaded() {
   // TODO(https://crbug.com/1039613): Update the loader factories passed to the
   // script loader factory too.
   DCHECK_EQ(NEW, status());
-  embedded_worker_->CreateFactoryBundles(
-      base::BindOnce(&ServiceWorkerVersion::InitializeGlobalScope,
-                     weak_factory_.GetWeakPtr()));
+  EmbeddedWorkerInstance::CreateFactoryBundlesResult result =
+      embedded_worker_->CreateFactoryBundles();
+  InitializeGlobalScope(std::move(result.script_bundle),
+                        std::move(result.subresource_bundle));
 }
 
 void ServiceWorkerVersion::InitializeGlobalScope(