commit 475006d4a30f8bc47f82eb540a6a066da2829095
author Tommi <tommi@webrtc.org> Thu May 14 11:28:29 2020
committer Commit Bot <commit-bot@chromium.org> Thu May 14 12:54:54 2020
tree 59082b124ada52c70187faabf76bc4b02e701407
parent 97755813dd9b9ffee255e4e4e2b47f26ddcc2994

Revert back to using the task_queue_ for guarding access.

This removes the SequenceChecker that was temporarily used while
the rtc::Thread TQ implementation was being fixed.

Bug: none
Change-Id: Iaa46e47371211ac0a97b2dcaf23cef12b43ee8ea
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175081
Commit-Queue: Tommi <tommi@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31256}

rtc_base/task_utils/repeating_task.cc

diff --git a/rtc_base/task_utils/repeating_task.cc b/rtc_base/task_utils/repeating_task.cc
index 71911e6..3b84701 100644
--- a/rtc_base/task_utils/repeating_task.cc
+++ b/rtc_base/task_utils/repeating_task.cc
@@ -21,13 +21,12 @@
                                      TimeDelta first_delay)
     : task_queue_(task_queue),
       next_run_time_(Timestamp::Micros(rtc::TimeMicros()) + first_delay) {
-  sequence_checker_.Detach();
 }
 
 RepeatingTaskBase::~RepeatingTaskBase() = default;
 
 bool RepeatingTaskBase::Run() {
-  RTC_DCHECK_RUN_ON(&sequence_checker_);
+  RTC_DCHECK_RUN_ON(task_queue_);
   // Return true to tell the TaskQueue to destruct this object.
   if (next_run_time_.IsPlusInfinity())
     return true;
@@ -53,7 +52,7 @@
 }
 
 void RepeatingTaskBase::Stop() {
-  RTC_DCHECK_RUN_ON(&sequence_checker_);
+  RTC_DCHECK_RUN_ON(task_queue_);
   RTC_DCHECK(next_run_time_.IsFinite());
   next_run_time_ = Timestamp::PlusInfinity();
 }

rtc_base/task_utils/repeating_task.h

diff --git a/rtc_base/task_utils/repeating_task.h b/rtc_base/task_utils/repeating_task.h
index 75d03bf..f7ae55e 100644
--- a/rtc_base/task_utils/repeating_task.h
+++ b/rtc_base/task_utils/repeating_task.h
@@ -19,7 +19,6 @@
 #include "api/task_queue/task_queue_base.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 
@@ -41,14 +40,7 @@
   TaskQueueBase* const task_queue_;
   // This is always finite, except for the special case where it's PlusInfinity
   // to signal that the task should stop.
-  Timestamp next_run_time_ RTC_GUARDED_BY(sequence_checker_);
-  // We use a SequenceChecker to check for correct usage instead of using
-  // RTC_DCHECK_RUN_ON(task_queue_). This is to work around a compatibility
-  // issue with some TQ implementations such as rtc::Thread that don't
-  // consistently set themselves as the 'current' TQ when running tasks.
-  // The SequenceChecker detects those implementations differently but gives
-  // the same effect as far as thread safety goes.
-  SequenceChecker sequence_checker_;
+  Timestamp next_run_time_ RTC_GUARDED_BY(task_queue_);
 };
 
 // The template closure pattern is based on rtc::ClosureTask.