From 60fd73a9fc00abe3790908940c9aa625294e4074 Mon Sep 17 00:00:00 2001
From: Danil Chapovalov <danilchap@webrtc.org>
Date: Wed, 27 Feb 2019 17:59:45 +0100
Subject: [PATCH] Migrate SequencedTaskChecker to rely on webrtc::TaskQueueBase
 interface

Bug: webrtc:10191
Change-Id: I94254defac26e45f684dc5be73f0b18b5108b2be
Reviewed-on: https://webrtc-review.googlesource.com/c/124120
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26888}
---
 rtc_base/BUILD.gn                       | 2 +-
 rtc_base/sequenced_task_checker_impl.cc | 6 +++---
 rtc_base/sequenced_task_checker_impl.h  | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 8a8ad32196..8f072bdd1a 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -611,8 +611,8 @@ rtc_source_set("sequenced_task_checker") {
     ":checks",
     ":criticalsection",
     ":macromagic",
-    ":rtc_task_queue",
     ":thread_checker",
+    "../api/task_queue",
   ]
 }
 
diff --git a/rtc_base/sequenced_task_checker_impl.cc b/rtc_base/sequenced_task_checker_impl.cc
index 717cb95040..678f91d0fd 100644
--- a/rtc_base/sequenced_task_checker_impl.cc
+++ b/rtc_base/sequenced_task_checker_impl.cc
@@ -14,19 +14,19 @@
 #include <dispatch/dispatch.h>
 #endif
 
+#include "api/task_queue/task_queue_base.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/sequenced_task_checker.h"
-#include "rtc_base/task_queue.h"
 
 namespace rtc {
 
 SequencedTaskCheckerImpl::SequencedTaskCheckerImpl()
-    : attached_(true), valid_queue_(TaskQueue::Current()) {}
+    : attached_(true), valid_queue_(webrtc::TaskQueueBase::Current()) {}
 
 SequencedTaskCheckerImpl::~SequencedTaskCheckerImpl() {}
 
 bool SequencedTaskCheckerImpl::CalledSequentially() const {
-  QueueId current_queue = TaskQueue::Current();
+  QueueId current_queue = webrtc::TaskQueueBase::Current();
 #if defined(WEBRTC_MAC)
   // If we're not running on a TaskQueue, use the system dispatch queue
   // label as an identifier.
diff --git a/rtc_base/sequenced_task_checker_impl.h b/rtc_base/sequenced_task_checker_impl.h
index a850b945dc..bd539611cd 100644
--- a/rtc_base/sequenced_task_checker_impl.h
+++ b/rtc_base/sequenced_task_checker_impl.h
@@ -16,7 +16,6 @@
 
 namespace rtc {
 
-class TaskQueue;
 // Real implementation of SequencedTaskChecker, for use in debug mode, or
 // for temporary use in release mode.
 //