Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Unified Diff: chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc

Issue 881203003: Suppress sequence checks in SyncFileSystem on the shutdown phase (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: +param comment Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc
index cd24f6ec2a547072260b202c3ec6471c9a80c86d..cf01a067f3d03f5ff916f189bab95b609a6b6e35 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc
@@ -62,7 +62,8 @@ class TaskManagerClient
last_operation_status_(SYNC_STATUS_OK) {
task_manager_.reset(new SyncTaskManager(
AsWeakPtr(), maximum_background_task,
- base::ThreadTaskRunnerHandle::Get()));
+ base::ThreadTaskRunnerHandle::Get(),
+ nullptr /* worker_pool */));
task_manager_->Initialize(SYNC_STATUS_OK);
base::MessageLoop::current()->RunUntilIdle();
maybe_schedule_next_task_count_ = 0;
@@ -392,7 +393,8 @@ TEST(SyncTaskManagerTest, ScheduleAndCancelSyncTask) {
{
SyncTaskManager task_manager(base::WeakPtr<SyncTaskManager::Client>(),
0 /* maximum_background_task */,
- base::ThreadTaskRunnerHandle::Get());
+ base::ThreadTaskRunnerHandle::Get(),
+ nullptr /* worker_pool */);
task_manager.Initialize(SYNC_STATUS_OK);
message_loop.RunUntilIdle();
task_manager.ScheduleSyncTask(
@@ -414,7 +416,8 @@ TEST(SyncTaskManagerTest, ScheduleTaskAtPriority) {
base::MessageLoop message_loop;
SyncTaskManager task_manager(base::WeakPtr<SyncTaskManager::Client>(),
0 /* maximum_background_task */,
- base::ThreadTaskRunnerHandle::Get());
+ base::ThreadTaskRunnerHandle::Get(),
+ nullptr /* worker_pool */);
task_manager.Initialize(SYNC_STATUS_OK);
message_loop.RunUntilIdle();
@@ -475,7 +478,8 @@ TEST(SyncTaskManagerTest, BackgroundTask_Sequential) {
base::MessageLoop message_loop;
SyncTaskManager task_manager(base::WeakPtr<SyncTaskManager::Client>(),
10 /* maximum_background_task */,
- base::ThreadTaskRunnerHandle::Get());
+ base::ThreadTaskRunnerHandle::Get(),
+ nullptr /* worker_pool */);
task_manager.Initialize(SYNC_STATUS_OK);
SyncStatusCode status = SYNC_STATUS_FAILED;
@@ -516,7 +520,8 @@ TEST(SyncTaskManagerTest, BackgroundTask_Parallel) {
base::MessageLoop message_loop;
SyncTaskManager task_manager(base::WeakPtr<SyncTaskManager::Client>(),
10 /* maximum_background_task */,
- base::ThreadTaskRunnerHandle::Get());
+ base::ThreadTaskRunnerHandle::Get(),
+ nullptr /* worker_pool */);
task_manager.Initialize(SYNC_STATUS_OK);
SyncStatusCode status = SYNC_STATUS_FAILED;
@@ -557,7 +562,8 @@ TEST(SyncTaskManagerTest, BackgroundTask_Throttled) {
base::MessageLoop message_loop;
SyncTaskManager task_manager(base::WeakPtr<SyncTaskManager::Client>(),
2 /* maximum_background_task */,
- base::ThreadTaskRunnerHandle::Get());
+ base::ThreadTaskRunnerHandle::Get(),
+ nullptr /* worker_pool */);
task_manager.Initialize(SYNC_STATUS_OK);
SyncStatusCode status = SYNC_STATUS_FAILED;
@@ -598,7 +604,8 @@ TEST(SyncTaskManagerTest, UpdateTaskBlocker) {
base::MessageLoop message_loop;
SyncTaskManager task_manager(base::WeakPtr<SyncTaskManager::Client>(),
10 /* maximum_background_task */,
- base::ThreadTaskRunnerHandle::Get());
+ base::ThreadTaskRunnerHandle::Get(),
+ nullptr /* worker_pool */);
task_manager.Initialize(SYNC_STATUS_OK);
SyncStatusCode status1 = SYNC_STATUS_FAILED;

Powered by Google App Engine
This is Rietveld 408576698