Make ContentCaptureTask garbage collected

Bug: 1058341
Change-Id: I6e94a95be6e09d33da4424a9e228b69386e43783
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2087240Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Keishi Hattori <keishi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747128}

third_party/blink/renderer/core/content_capture/content_capture_manager.cc

@@ -30,15 +30,14 @@ void ContentCaptureManager::ScheduleTaskIfNeeded() {
 
 void ContentCaptureManager::ScheduleTask(
     ContentCaptureTask::ScheduleReason reason) {
-  if (!content_capture_idle_task_.get()) {
+  if (!content_capture_idle_task_) {
     content_capture_idle_task_ = CreateContentCaptureTask();
   }
   content_capture_idle_task_->Schedule(reason);
 }
 
-scoped_refptr<ContentCaptureTask>
-ContentCaptureManager::CreateContentCaptureTask() {
-  return base::MakeRefCounted<ContentCaptureTask>(*local_frame_root_,
+ContentCaptureTask* ContentCaptureManager::CreateContentCaptureTask() {
+  return MakeGarbageCollected<ContentCaptureTask>(*local_frame_root_,
                                                   *task_session_);
 }
 
@@ -61,6 +60,7 @@ void ContentCaptureManager::OnNodeTextChanged(Node& node) {
 }
 
 void ContentCaptureManager::Trace(Visitor* visitor) {
+  visitor->Trace(content_capture_idle_task_);
   visitor->Trace(local_frame_root_);
   visitor->Trace(task_session_);
   visitor->Trace(sent_nodes_);
@@ -69,7 +69,7 @@ void ContentCaptureManager::Trace(Visitor* visitor) {
 void ContentCaptureManager::Shutdown() {
   if (content_capture_idle_task_) {
     content_capture_idle_task_->Shutdown();
-    content_capture_idle_task_.reset();
+    content_capture_idle_task_ = nullptr;
   }
 }
 

third_party/blink/renderer/core/content_capture/content_capture_manager.h

@@ -42,18 +42,18 @@ class CORE_EXPORT ContentCaptureManager
   virtual void Trace(Visitor*);
 
   ContentCaptureTask* GetContentCaptureTaskForTesting() const {
-    return content_capture_idle_task_.get();
+    return content_capture_idle_task_;
   }
 
  protected:
-  virtual scoped_refptr<ContentCaptureTask> CreateContentCaptureTask();
+  virtual ContentCaptureTask* CreateContentCaptureTask();
   TaskSession& GetTaskSessionForTesting() const { return *task_session_; }
 
  private:
   void NotifyNodeDetached(const Node& node);
   void ScheduleTask(ContentCaptureTask::ScheduleReason reason);
 
-  scoped_refptr<ContentCaptureTask> content_capture_idle_task_;
+  Member<ContentCaptureTask> content_capture_idle_task_;
 
   Member<LocalFrame> local_frame_root_;
 

third_party/blink/renderer/core/content_capture/content_capture_task.cc

@@ -268,4 +268,9 @@ void ContentCaptureTask::CancelTaskForTesting() {
     delay_task_->Stop();
 }
 
+void ContentCaptureTask::Trace(Visitor* visitor) {
+  visitor->Trace(local_frame_root_);
+  visitor->Trace(task_session_);
+}
+
 }  // namespace blink

third_party/blink/renderer/core/content_capture/content_capture_task.h

@@ -24,9 +24,8 @@ class LocalFrame;
 
 // This class is used to capture the on-screen content and send them out
 // through WebContentCaptureClient.
-class CORE_EXPORT ContentCaptureTask : public RefCounted<ContentCaptureTask> {
-  USING_FAST_MALLOC(ContentCaptureTask);
-
+class CORE_EXPORT ContentCaptureTask
+    : public GarbageCollected<ContentCaptureTask> {
  public:
   enum class ScheduleReason {
     kFirstContentChange,
@@ -69,6 +68,8 @@ class CORE_EXPORT ContentCaptureTask : public RefCounted<ContentCaptureTask> {
   base::TimeDelta GetTaskNextFireIntervalForTesting() const;
   void CancelTaskForTesting();
 
+  void Trace(Visitor*);
+
  protected:
   // All protected data and methods are for testing purpose.
   // Return true if the task should pause.
@@ -103,8 +104,8 @@ class CORE_EXPORT ContentCaptureTask : public RefCounted<ContentCaptureTask> {
   // Indicates if there is content change since last run.
   bool has_content_change_ = false;
 
-  UntracedMember<LocalFrame> local_frame_root_;
-  UntracedMember<TaskSession> task_session_;
+  Member<LocalFrame> local_frame_root_;
+  Member<TaskSession> task_session_;
   std::unique_ptr<TaskRunnerTimer<ContentCaptureTask>> delay_task_;
   TaskState task_state_ = TaskState::kStop;
 

third_party/blink/renderer/core/content_capture/content_capture_test.cc

@@ -120,21 +120,26 @@ class ContentCaptureManagerTestHelper : public ContentCaptureManager {
       LocalFrame& local_frame_root,
       WebContentCaptureClientTestHelper& content_capture_client)
       : ContentCaptureManager(local_frame_root) {
-    content_capture_task_ = base::MakeRefCounted<ContentCaptureTaskTestHelper>(
+    content_capture_task_ = MakeGarbageCollected<ContentCaptureTaskTestHelper>(
         local_frame_root, GetTaskSessionForTesting(), content_capture_client);
   }
 
-  scoped_refptr<ContentCaptureTaskTestHelper> GetContentCaptureTask() {
+  ContentCaptureTaskTestHelper* GetContentCaptureTask() {
     return content_capture_task_;
   }
 
+  void Trace(Visitor* visitor) override {
+    visitor->Trace(content_capture_task_);
+    ContentCaptureManager::Trace(visitor);
+  }
+
  protected:
-  scoped_refptr<ContentCaptureTask> CreateContentCaptureTask() override {
+  ContentCaptureTask* CreateContentCaptureTask() override {
     return content_capture_task_;
   }
 
  private:
-  scoped_refptr<ContentCaptureTaskTestHelper> content_capture_task_;
+  Member<ContentCaptureTaskTestHelper> content_capture_task_;
 };
 
 class ContentCaptureLocalFrameClientHelper : public EmptyLocalFrameClient {
@@ -208,7 +213,7 @@ class ContentCaptureTest : public PageTestBase {
     return content_capture_client_.get();
   }
 
-  scoped_refptr<ContentCaptureTaskTestHelper> GetContentCaptureTask() const {
+  ContentCaptureTaskTestHelper* GetContentCaptureTask() const {
     return GetContentCaptureManager()->GetContentCaptureTask();
   }
 
@@ -526,7 +531,7 @@ TEST_F(ContentCaptureTest, TaskHistogramReporter) {
 
 TEST_F(ContentCaptureTest, RescheduleTask) {
   // This test assumes test runs much faster than task's long delay which is 5s.
-  scoped_refptr<ContentCaptureTaskTestHelper> task = GetContentCaptureTask();
+  Persistent<ContentCaptureTaskTestHelper> task = GetContentCaptureTask();
   task->CancelTaskForTesting();
   EXPECT_TRUE(task->GetTaskNextFireIntervalForTesting().is_zero());
   task->Schedule(ContentCaptureTask::ScheduleReason::kContentChange);
@@ -543,7 +548,7 @@ TEST_F(ContentCaptureTest, RescheduleTask) {
 
 TEST_F(ContentCaptureTest, NotRescheduleTask) {
   // This test assumes test runs much faster than task's long delay which is 5s.
-  scoped_refptr<ContentCaptureTaskTestHelper> task = GetContentCaptureTask();
+  Persistent<ContentCaptureTaskTestHelper> task = GetContentCaptureTask();
   task->CancelTaskForTesting();
   EXPECT_TRUE(task->GetTaskNextFireIntervalForTesting().is_zero());
   task->Schedule(ContentCaptureTask::ScheduleReason::kContentChange);