Fix EnumerateDedicatedWorkers to include final response url

EnumerateDedicatedWorkers is meant to allow an observer to
"catch up" to the notifications it missed by registering late.
This must include the OnFinalResponseURLDetermined() call.

Bug: 993029
Change-Id: I89f38db0b7a6fbf1c3bd42985d7a721dccd0fc5f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2204439
Commit-Queue: Patrick Monette <pmonette@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771196}

content/browser/worker_host/dedicated_worker_service_impl.cc

@@ -8,6 +8,21 @@
 
 namespace content {
 
+DedicatedWorkerServiceImpl::DedicatedWorkerInfo::DedicatedWorkerInfo(
+    int worker_process_id,
+    GlobalFrameRoutingId ancestor_render_frame_host_id)
+    : worker_process_id(worker_process_id),
+      ancestor_render_frame_host_id(ancestor_render_frame_host_id) {}
+
+DedicatedWorkerServiceImpl::DedicatedWorkerInfo::DedicatedWorkerInfo(
+    const DedicatedWorkerInfo& info) = default;
+DedicatedWorkerServiceImpl::DedicatedWorkerInfo&
+DedicatedWorkerServiceImpl::DedicatedWorkerInfo::operator=(
+    const DedicatedWorkerInfo& info) = default;
+
+DedicatedWorkerServiceImpl::DedicatedWorkerInfo::~DedicatedWorkerInfo() =
+    default;
+
 DedicatedWorkerServiceImpl::DedicatedWorkerServiceImpl() = default;
 
 DedicatedWorkerServiceImpl::~DedicatedWorkerServiceImpl() = default;
@@ -28,6 +43,10 @@ void DedicatedWorkerServiceImpl::EnumerateDedicatedWorkers(Observer* observer) {
     observer->OnWorkerCreated(
         dedicated_worker_id, dedicated_worker_info.worker_process_id,
         dedicated_worker_info.ancestor_render_frame_host_id);
+    if (dedicated_worker_info.final_response_url) {
+      observer->OnFinalResponseURLDetermined(
+          dedicated_worker_id, *dedicated_worker_info.final_response_url);
+    }
   }
 }
 
@@ -42,8 +61,8 @@ void DedicatedWorkerServiceImpl::NotifyWorkerCreated(
   bool inserted =
       dedicated_worker_infos_
           .emplace(dedicated_worker_id,
-                   DedicatedWorkerInfo{worker_process_id,
-                                       ancestor_render_frame_host_id})
+                   DedicatedWorkerInfo(worker_process_id,
+                                       ancestor_render_frame_host_id))
           .second;
   DCHECK(inserted);
 
@@ -68,7 +87,10 @@ void DedicatedWorkerServiceImpl::NotifyBeforeWorkerDestroyed(
 void DedicatedWorkerServiceImpl::NotifyWorkerFinalResponseURLDetermined(
     DedicatedWorkerId dedicated_worker_id,
     const GURL& url) {
-  DCHECK(base::Contains(dedicated_worker_infos_, dedicated_worker_id));
+  auto it = dedicated_worker_infos_.find(dedicated_worker_id);
+  DCHECK(it != dedicated_worker_infos_.end());
+
+  it->second.final_response_url = url;
 
   for (Observer& observer : observers_)
     observer.OnFinalResponseURLDetermined(dedicated_worker_id, url);

content/browser/worker_host/dedicated_worker_service_impl.h

@@ -7,6 +7,7 @@
 
 #include "base/observer_list.h"
 #include "content/public/browser/dedicated_worker_service.h"
+#include "url/gurl.h"
 
 namespace content {
 
@@ -47,8 +48,16 @@ class CONTENT_EXPORT DedicatedWorkerServiceImpl
   base::ObserverList<Observer> observers_;
 
   struct DedicatedWorkerInfo {
+    DedicatedWorkerInfo(int worker_process_id,
+                        GlobalFrameRoutingId ancestor_render_frame_host_id);
+    ~DedicatedWorkerInfo();
+
+    DedicatedWorkerInfo(const DedicatedWorkerInfo& info);
+    DedicatedWorkerInfo& operator=(const DedicatedWorkerInfo& info);
+
     int worker_process_id;
     GlobalFrameRoutingId ancestor_render_frame_host_id;
+    base::Optional<GURL> final_response_url;
   };
   base::flat_map<DedicatedWorkerId, DedicatedWorkerInfo>
       dedicated_worker_infos_;