Make test runner to Sequenced rather than single threaded.

Bug: b:222539905
Bug: chromium:1308423
Bug: chromium:1306208
Change-Id: I162b559e75947f930ba57ae98d9f66832e1dda89
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3546510
Reviewed-by: Vignesh Shenvi <vshenvi@google.com>
Commit-Queue: Leonid Baraz <lbaraz@chromium.org>
Cr-Commit-Position: refs/heads/main@{#984962}

components/reporting/storage/storage_queue_unittest.cc

@@ -354,8 +354,7 @@ class StorageQueueTest
         : uploader_id_(next_uploader_id.fetch_add(1)),
           last_record_digest_map_(&self->last_record_digest_map_),
           mock_upload_(&self->mock_upload_),
-          sequence_bound_upload_(self->main_thread_task_runner_,
-                                 &self->mock_upload_) {
+          sequence_bound_upload_(self->main_task_runner_, &self->mock_upload_) {
       DETACH_FROM_SEQUENCE(test_uploader_checker_);
     }
 
@@ -590,7 +589,7 @@ class StorageQueueTest
   void AsyncStartMockUploader(
       UploaderInterface::UploadReason reason,
       UploaderInterface::UploaderInterfaceResultCb start_uploader_cb) {
-    main_thread_task_runner_->PostTask(
+    main_task_runner_->PostTask(
         FROM_HERE,
         base::BindOnce(
             [](UploaderInterface::UploadReason reason,
@@ -649,9 +648,9 @@ class StorageQueueTest
   std::string dm_token_;
   base::test::TaskEnvironment task_environment_{
       base::test::TaskEnvironment::TimeSource::MOCK_TIME};
-  // Single task runner where all EXPECTs will happen - main thread.
-  const scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_{
-      base::ThreadTaskRunnerHandle::Get()};
+  // Sequenced task runner where all EXPECTs will happen.
+  const scoped_refptr<base::SequencedTaskRunner> main_task_runner_{
+      base::SequencedTaskRunnerHandle::Get()};
 
   base::test::ScopedFeatureList scoped_feature_list_;
   base::ScopedTempDir location_;

components/reporting/storage/storage_unittest.cc

@@ -527,8 +527,7 @@ class StorageTest
         : uploader_id_(next_uploader_id.fetch_add(1)),
           last_record_digest_map_(&self->last_record_digest_map_),
           mock_upload_(&self->mock_upload_),
-          sequence_bound_upload_(self->main_thread_task_runner_,
-                                 &self->mock_upload_),
+          sequence_bound_upload_(self->main_task_runner_, &self->mock_upload_),
           decryptor_(self->decryptor_) {
       DETACH_FROM_SEQUENCE(test_uploader_checker_);
     }
@@ -794,7 +793,7 @@ class StorageTest
   void AsyncStartMockUploader(
       UploaderInterface::UploadReason reason,
       UploaderInterface::UploaderInterfaceResultCb start_uploader_cb) {
-    main_thread_task_runner_->PostTask(
+    main_task_runner_->PostTask(
         FROM_HERE,
         base::BindOnce(
             [](UploaderInterface::UploadReason reason,
@@ -913,9 +912,9 @@ class StorageTest
 
   base::test::TaskEnvironment task_environment_{
       base::test::TaskEnvironment::TimeSource::MOCK_TIME};
-  // Single task runner where all EXPECTs will happen - main thread.
-  const scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_{
-      base::ThreadTaskRunnerHandle::Get()};
+  // Sequenced task runner where all EXPECTs will happen - main thread.
+  const scoped_refptr<base::SequencedTaskRunner> main_task_runner_{
+      base::SequencedTaskRunnerHandle::Get()};
 
   base::test::ScopedFeatureList scoped_feature_list_;