Fix unintentionally reverted change in DedicatedWorkerHost

After a bad git rebase, I mistakenly reverted part of a previously
landed CL in a subsequent one.

This is the CL that was partially reverted:
https://chromium-review.googlesource.com/c/chromium/src/+/1990211

This is the CL that did the partial revert:
https://chromium-review.googlesource.com/c/chromium/src/+/1988831

Also, I had to fix a test that was added since then.

Bug: 1040794
Change-Id: Icb662bd0bee94917ba2bc59b20e63289ca9d3247
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2008148Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Commit-Queue: Patrick Monette <pmonette@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733421}

content/browser/frame_host/render_frame_host_impl.cc

@@ -6521,11 +6521,15 @@ void RenderFrameHostImpl::CreateInstalledAppProvider(
 
 void RenderFrameHostImpl::CreateDedicatedWorkerHostFactory(
     mojo::PendingReceiver<blink::mojom::DedicatedWorkerHostFactory> receiver) {
+  // Allocate the worker in the same process as the creator.
+  int worker_process_id = process_->GetID();
+
   // When a dedicated worker is created from the frame script, the frame is both
   // the creator and the ancestor.
   content::CreateDedicatedWorkerHostFactory(
-      /* creator_frame_routing_id = */ GetGlobalFrameRoutingId(),
-      /* ancestor_frame_routing_id = */ GetGlobalFrameRoutingId(),
+      worker_process_id,
+      /*creator_render_frame_host_id=*/GetGlobalFrameRoutingId(),
+      /*ancestor_render_frame_host_id=*/GetGlobalFrameRoutingId(),
       last_committed_origin_, std::move(receiver));
 }
 

content/browser/worker_host/dedicated_worker_host.cc

@@ -43,7 +43,7 @@ DedicatedWorkerHost::DedicatedWorkerHost(
     DedicatedWorkerServiceImpl* service,
     DedicatedWorkerId id,
     RenderProcessHost* worker_process_host,
-    GlobalFrameRoutingId creator_render_frame_host_id,
+    base::Optional<GlobalFrameRoutingId> creator_render_frame_host_id,
     GlobalFrameRoutingId ancestor_render_frame_host_id,
     const url::Origin& origin,
     mojo::PendingReceiver<blink::mojom::DedicatedWorkerHost> host)
@@ -167,9 +167,9 @@ void DedicatedWorkerHost::StartScriptLoad(
 
   // If this is a nested worker, there is no creator frame.
   RenderFrameHostImpl* creator_render_frame_host = nullptr;
-  if (creator_render_frame_host_id_.frame_routing_id != MSG_ROUTING_NONE) {
+  if (creator_render_frame_host_id_) {
     creator_render_frame_host =
-        RenderFrameHostImpl::FromID(creator_render_frame_host_id_);
+        RenderFrameHostImpl::FromID(creator_render_frame_host_id_.value());
     if (!creator_render_frame_host) {
       client_->OnScriptLoadStartFailed();
       return;
@@ -368,11 +368,11 @@ void DedicatedWorkerHost::CreateQuicTransportConnector(
 void DedicatedWorkerHost::CreateNestedDedicatedWorker(
     mojo::PendingReceiver<blink::mojom::DedicatedWorkerHostFactory> receiver) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  GlobalFrameRoutingId new_creator_render_frame_host_id(
-      worker_process_host_->GetID(), MSG_ROUTING_NONE);
-  CreateDedicatedWorkerHostFactory(new_creator_render_frame_host_id,
-                                   ancestor_render_frame_host_id_, origin_,
-                                   std::move(receiver));
+  // There is no creator frame when the worker is nested.
+  CreateDedicatedWorkerHostFactory(
+      worker_process_host_->GetID(),
+      /*creator_render_frame_host_id_=*/base::nullopt,
+      ancestor_render_frame_host_id_, origin_, std::move(receiver));
 }
 
 void DedicatedWorkerHost::CreateIdleManager(
@@ -448,7 +448,6 @@ void DedicatedWorkerHost::UpdateSubresourceLoaderFactories() {
   auto* storage_partition_impl = static_cast<StoragePartitionImpl*>(
       worker_process_host_->GetStoragePartition());
 
-  // Get a storage domain.
   RenderFrameHostImpl* ancestor_render_frame_host =
       RenderFrameHostImpl::FromID(ancestor_render_frame_host_id_);
   if (!ancestor_render_frame_host)
@@ -458,6 +457,7 @@ void DedicatedWorkerHost::UpdateSubresourceLoaderFactories() {
   if (!site_instance)
     return;
 
+  // Get a storage domain.
   std::string storage_domain;
   std::string partition_name;
   bool in_memory;
@@ -496,10 +496,12 @@ class DedicatedWorkerHostFactoryImpl final
     : public blink::mojom::DedicatedWorkerHostFactory {
  public:
   DedicatedWorkerHostFactoryImpl(
-      GlobalFrameRoutingId creator_render_frame_host_id,
+      int worker_process_id,
+      base::Optional<GlobalFrameRoutingId> creator_render_frame_host_id,
       GlobalFrameRoutingId ancestor_render_frame_host_id,
       const url::Origin& parent_context_origin)
-      : creator_render_frame_host_id_(creator_render_frame_host_id),
+      : worker_process_id_(worker_process_id),
+        creator_render_frame_host_id_(creator_render_frame_host_id),
         ancestor_render_frame_host_id_(ancestor_render_frame_host_id),
         parent_context_origin_(parent_context_origin) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -518,9 +520,7 @@ class DedicatedWorkerHostFactoryImpl final
       return;
     }
 
-    // Allocate the worker in the same process as the creator.
-    auto* worker_process_host =
-        RenderProcessHost::FromID(creator_render_frame_host_id_.child_id);
+    auto* worker_process_host = RenderProcessHost::FromID(worker_process_id_);
     if (!worker_process_host) {
       // Abort if the worker's process host is gone. This means that the calling
       // frame or worker is also either destroyed or in the process of being
@@ -565,9 +565,7 @@ class DedicatedWorkerHostFactoryImpl final
       return;
     }
 
-    // Allocate the worker in the same process as the creator.
-    auto* worker_process_host =
-        RenderProcessHost::FromID(creator_render_frame_host_id_.child_id);
+    auto* worker_process_host = RenderProcessHost::FromID(worker_process_id_);
     if (!worker_process_host) {
       // Abort if the worker's process host is gone. This means that the calling
       // frame or worker is also either destroyed or in the process of being
@@ -604,8 +602,11 @@ class DedicatedWorkerHostFactoryImpl final
   }
 
  private:
+  // The ID of the RenderProcessHost where the worker will live.
+  const int worker_process_id_;
+
   // See comments on the corresponding members of DedicatedWorkerHost.
-  const GlobalFrameRoutingId creator_render_frame_host_id_;
+  const base::Optional<GlobalFrameRoutingId> creator_render_frame_host_id_;
   const GlobalFrameRoutingId ancestor_render_frame_host_id_;
 
   const url::Origin parent_context_origin_;
@@ -616,14 +617,16 @@ class DedicatedWorkerHostFactoryImpl final
 }  // namespace
 
 void CreateDedicatedWorkerHostFactory(
-    GlobalFrameRoutingId creator_render_frame_host_id,
+    int worker_process_id,
+    base::Optional<GlobalFrameRoutingId> creator_render_frame_host_id,
     GlobalFrameRoutingId ancestor_render_frame_host_id,
     const url::Origin& origin,
     mojo::PendingReceiver<blink::mojom::DedicatedWorkerHostFactory> receiver) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   mojo::MakeSelfOwnedReceiver(
       std::make_unique<DedicatedWorkerHostFactoryImpl>(
-          creator_render_frame_host_id, ancestor_render_frame_host_id, origin),
+          worker_process_id, creator_render_frame_host_id,
+          ancestor_render_frame_host_id, origin),
       std::move(receiver));
 }
 

content/browser/worker_host/dedicated_worker_host.h

@@ -5,6 +5,7 @@
 #ifndef CONTENT_BROWSER_WORKER_HOST_DEDICATED_WORKER_HOST_H_
 #define CONTENT_BROWSER_WORKER_HOST_DEDICATED_WORKER_HOST_H_
 
+#include "base/optional.h"
 #include "base/scoped_observer.h"
 #include "build/build_config.h"
 #include "content/browser/browser_interface_broker_impl.h"
@@ -46,7 +47,8 @@ class StoragePartitionImpl;
 // Creates a host factory for a dedicated worker. This must be called on the UI
 // thread.
 CONTENT_EXPORT void CreateDedicatedWorkerHostFactory(
-    GlobalFrameRoutingId creator_render_frame_host_id,
+    int worker_process_id,
+    base::Optional<GlobalFrameRoutingId> creator_render_frame_host_id,
     GlobalFrameRoutingId ancestor_render_frame_host_id,
     const url::Origin& origin,
     mojo::PendingReceiver<blink::mojom::DedicatedWorkerHostFactory> receiver);
@@ -61,7 +63,7 @@ class DedicatedWorkerHost final : public blink::mojom::DedicatedWorkerHost,
       DedicatedWorkerServiceImpl* service,
       DedicatedWorkerId id,
       RenderProcessHost* worker_process_host,
-      GlobalFrameRoutingId creator_render_frame_host_id,
+      base::Optional<GlobalFrameRoutingId> creator_render_frame_host_id,
       GlobalFrameRoutingId ancestor_render_frame_host_id,
       const url::Origin& origin,
       mojo::PendingReceiver<blink::mojom::DedicatedWorkerHost> host);
@@ -164,10 +166,9 @@ class DedicatedWorkerHost final : public blink::mojom::DedicatedWorkerHost,
   ScopedObserver<RenderProcessHost, RenderProcessHostObserver>
       scoped_process_host_observer_;
 
-  // The ID of the frame that directly starts this worker. This is
-  // {creator_render_process_host_id, MSG_ROUTING_NONE} when this worker is
-  // nested.
-  const GlobalFrameRoutingId creator_render_frame_host_id_;
+  // The ID of the frame that directly starts this worker. This is base::nullopt
+  // when this worker is nested.
+  const base::Optional<GlobalFrameRoutingId> creator_render_frame_host_id_;
 
   // The ID of the frame that owns this worker, either directly, or (in the case
   // of nested workers) indirectly via a tree of dedicated workers.

content/browser/worker_host/dedicated_worker_service_impl_unittest.cc

@@ -26,9 +26,10 @@ namespace content {
 class MockDedicatedWorker
     : public blink::mojom::DedicatedWorkerHostFactoryClient {
  public:
-  explicit MockDedicatedWorker(GlobalFrameRoutingId render_frame_host_id) {
-    CreateDedicatedWorkerHostFactory(render_frame_host_id, render_frame_host_id,
-                                     url::Origin(),
+  MockDedicatedWorker(int worker_process_id,
+                      GlobalFrameRoutingId render_frame_host_id) {
+    CreateDedicatedWorkerHostFactory(worker_process_id, render_frame_host_id,
+                                     render_frame_host_id, url::Origin(),
                                      factory_.BindNewPipeAndPassReceiver());
 
     if (base::FeatureList::IsEnabled(blink::features::kPlzDedicatedWorker)) {
@@ -185,8 +186,8 @@ TEST_P(DedicatedWorkerServiceImplTest, ObserveWorkerCreationAndDestruction) {
   // Create the dedicated worker.
   GlobalFrameRoutingId ancestor_render_frame_host_id =
       render_frame_host->GetGlobalFrameRoutingId();
-  auto mock_dedicated_worker =
-      std::make_unique<MockDedicatedWorker>(ancestor_render_frame_host_id);
+  auto mock_dedicated_worker = std::make_unique<MockDedicatedWorker>(
+      render_frame_host->GetProcess()->GetID(), ancestor_render_frame_host_id);
   RunUntilWorkerEvent();
 
   // The service sent a OnWorkerStarted() notification.