commit 5bd0474d91e0b337e23a13c53a6a0b98eb7c91d7
author Hiroshige Hayashizaki <hiroshige@chromium.org> Thu Feb 21 07:37:37 2019
committer Commit Bot <commit-bot@chromium.org> Thu Feb 21 07:37:37 2019
tree 56e7e4f2399c12d4c4bf4687ce5c2a54981d1b8d
parent a7e1819b2035ed34dda312b359521c2d6e408f3b

Remove InspectorNetworkAgent::replay_xhrs_to_be_deleted_

As XMLHttpRequest is now GarbageCollected, async destruction is
no longer needed.

Bug: 880027
Change-Id: Ieee63d77af98c4b053b567d477b5397b628448a2
Reviewed-on: https://chromium-review.googlesource.com/c/1383915
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#634110}

third_party/blink/renderer/core/inspector/inspector_network_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
index da45d48..f2692e2b 100644
--- a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
@@ -685,7 +685,6 @@
   visitor->Trace(worker_global_scope_);
   visitor->Trace(resources_data_);
   visitor->Trace(replay_xhrs_);
-  visitor->Trace(replay_xhrs_to_be_deleted_);
   visitor->Trace(pending_xhr_replay_data_);
   InspectorBaseAgent::Trace(visitor);
 }
@@ -1122,13 +1121,7 @@
 }
 
 void InspectorNetworkAgent::DidFinishXHR(XMLHttpRequest* xhr) {
-  // This method will be called from the XHR.
-  // We delay deleting the replay XHR, as deleting here may delete the caller.
-  if (!replay_xhrs_.Contains(xhr))
-    return;
-  replay_xhrs_to_be_deleted_.insert(xhr);
   replay_xhrs_.erase(xhr);
-  remove_finished_replay_xhr_timer_.StartOneShot(TimeDelta(), FROM_HERE);
 }
 
 void InspectorNetworkAgent::WillSendEventSourceRequest() {
@@ -1651,10 +1644,6 @@
       ->toJSON();
 }
 
-void InspectorNetworkAgent::RemoveFinishedReplayXHRFired(TimerBase*) {
-  replay_xhrs_to_be_deleted_.clear();
-}
-
 InspectorNetworkAgent::InspectorNetworkAgent(
     InspectedFrames* inspected_frames,
     WorkerGlobalScope* worker_global_scope,
@@ -1667,13 +1656,6 @@
       devtools_token_(worker_global_scope_
                           ? worker_global_scope_->GetParentDevToolsToken()
                           : inspected_frames->Root()->GetDevToolsFrameToken()),
-      remove_finished_replay_xhr_timer_(
-          worker_global_scope_
-              ? worker_global_scope->GetTaskRunner(TaskType::kInternalLoading)
-              : inspected_frames->Root()->GetTaskRunner(
-                    TaskType::kInternalLoading),
-          this,
-          &InspectorNetworkAgent::RemoveFinishedReplayXHRFired),
       enabled_(&agent_state_, /*default_value=*/false),
       cache_disabled_(&agent_state_, /*default_value=*/false),
       bypass_service_worker_(&agent_state_, /*default_value=*/false),

third_party/blink/renderer/core/inspector/inspector_network_agent.h

diff --git a/third_party/blink/renderer/core/inspector/inspector_network_agent.h b/third_party/blink/renderer/core/inspector/inspector_network_agent.h
index 308630a..7d582424 100644
--- a/third_party/blink/renderer/core/inspector/inspector_network_agent.h
+++ b/third_party/blink/renderer/core/inspector/inspector_network_agent.h
@@ -253,7 +253,6 @@
                                const ResourceResponse& redirect_response,
                                const FetchInitiatorInfo&,
                                InspectorPageAgent::ResourceType);
-  void RemoveFinishedReplayXHRFired(TimerBase*);
 
   bool CanGetResponseBodyBlob(const String& request_id);
   void GetResponseBodyBlob(const String& request_id,
@@ -283,8 +282,6 @@
       frame_navigation_initiator_map_;
 
   HeapHashSet<Member<XMLHttpRequest>> replay_xhrs_;
-  HeapHashSet<Member<XMLHttpRequest>> replay_xhrs_to_be_deleted_;
-  TaskRunnerTimer<InspectorNetworkAgent> remove_finished_replay_xhr_timer_;
   InspectorAgentState::Boolean enabled_;
   InspectorAgentState::Boolean cache_disabled_;
   InspectorAgentState::Boolean bypass_service_worker_;