Task Scheduler API migration: change BrowserThreadModelWorker to SequencedModelWorker

components/sync/engine/sequenced_model_worker_unittest.cc

Index: components/sync/engine/sequenced_model_worker_unittest.cc
diff --git a/components/sync/engine/browser_thread_model_worker_unittest.cc b/components/sync/engine/sequenced_model_worker_unittest.cc
similarity index 57%
rename from components/sync/engine/browser_thread_model_worker_unittest.cc
rename to components/sync/engine/sequenced_model_worker_unittest.cc
index 98900e63521dc71421e8a6f279763c8f144af104..294ec45f1a840a46bd81c0647d4f46ef57ee0dac 100644
--- a/components/sync/engine/browser_thread_model_worker_unittest.cc
+++ b/components/sync/engine/sequenced_model_worker_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine/browser_thread_model_worker.h"
+#include "components/sync/engine/sequenced_model_worker.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ -10,28 +10,25 @@
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/task_scheduler/post_task.h"
+#include "base/test/scoped_async_task_scheduler.h"
 #include "base/test/test_timeouts.h"
-#include "base/threading/thread.h"
-#include "base/threading/thread_task_runner_handle.h"
+#include "base/threading/sequenced_task_runner_handle.h"
 #include "base/timer/timer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using base::Thread;
-using base::TimeDelta;
-
 namespace syncer {
 
 namespace {
 
-class SyncBrowserThreadModelWorkerTest : public testing::Test {
+class SequencedModelWorkerTest : public testing::Test {
  public:
-  SyncBrowserThreadModelWorkerTest()
-      : db_thread_("DB_Thread"), did_do_work_(false), weak_factory_(this) {}
+  SequencedModelWorkerTest() : did_do_work_(false), weak_factory_(this) {}
 
   bool did_do_work() { return did_do_work_; }
-  BrowserThreadModelWorker* worker() { return worker_.get(); }
+  SequencedModelWorker* worker() { return worker_.get(); }
   base::OneShotTimer* timer() { return &timer_; }
-  base::WeakPtrFactory<SyncBrowserThreadModelWorkerTest>* factory() {
+  base::WeakPtrFactory<SequencedModelWorkerTest>* factory() {
     return &weak_factory_;
   }
 
@@ -40,14 +37,14 @@ class SyncBrowserThreadModelWorkerTest : public testing::Test {
   void ScheduleWork() {
     // We wait until the callback is done. So it is safe to use unretained.
     timer()->Start(FROM_HERE, TestTimeouts::action_timeout(), this,
-                   &SyncBrowserThreadModelWorkerTest::Timeout);
+                   &SequencedModelWorkerTest::Timeout);
     worker()->DoWorkAndWaitUntilDone(base::BindOnce(
-        &SyncBrowserThreadModelWorkerTest::DoWork, base::Unretained(this)));
+        &SequencedModelWorkerTest::DoWork, base::Unretained(this)));
   }
 
   // This is the work that will be scheduled to be done on the DB thread.

[skym, 2017/06/16 17:26:53]

DB thread

[stanisc, 2017/06/19 19:14:05]

Done.

   SyncerError DoWork() {
-    EXPECT_TRUE(db_thread_.task_runner()->BelongsToCurrentThread());
+    EXPECT_TRUE(task_runner_->RunsTasksInCurrentSequence());
     main_message_loop_.task_runner()->PostTask(
         FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
     did_do_work_ = true;
@@ -57,35 +54,33 @@ class SyncBrowserThreadModelWorkerTest : public testing::Test {
   // This will be called by the OneShotTimer and make the test fail unless
   // DoWork is called first.
   void Timeout() {
-    ADD_FAILURE() << "Timed out waiting for work to be done on the DB thread.";
+    ADD_FAILURE()
+        << "Timed out waiting for work to be done on the DB sequence.";
     main_message_loop_.task_runner()->PostTask(
         FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
   }
 
  protected:
   void SetUp() override {
-    db_thread_.Start();
-    worker_ = new BrowserThreadModelWorker(db_thread_.task_runner(), GROUP_DB);
-  }
-
-  virtual void Teardown() {
-    worker_ = nullptr;
-    db_thread_.Stop();
+    task_runner_ = base::CreateSequencedTaskRunnerWithTraits(
+        {base::MayBlock(), base::TaskPriority::BACKGROUND});
+    worker_ = new SequencedModelWorker(task_runner_, GROUP_DB);
   }
 
  private:
   base::MessageLoop main_message_loop_;
-  Thread db_thread_;
+  base::test::ScopedAsyncTaskScheduler task_scheduler_;
   bool did_do_work_;
-  scoped_refptr<BrowserThreadModelWorker> worker_;
+  scoped_refptr<base::SequencedTaskRunner> task_runner_;
+  scoped_refptr<SequencedModelWorker> worker_;
   base::OneShotTimer timer_;
 
-  base::WeakPtrFactory<SyncBrowserThreadModelWorkerTest> weak_factory_;
+  base::WeakPtrFactory<SequencedModelWorkerTest> weak_factory_;
 };
 
-TEST_F(SyncBrowserThreadModelWorkerTest, DoesWorkOnDatabaseThread) {
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(&SyncBrowserThreadModelWorkerTest::ScheduleWork,
+TEST_F(SequencedModelWorkerTest, DoesWorkOnDatabaseSequence) {
+  base::SequencedTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE, base::Bind(&SequencedModelWorkerTest::ScheduleWork,
                             factory()->GetWeakPtr()));
   base::RunLoop().Run();
   EXPECT_TRUE(did_do_work());