[scheduling] Use ScopedTaskEnvironment instead of MessageLoop in drive_backend
MessageLoop will go away, eventually.
BUG=891670
Change-Id: Ia64f78ea238b99b0599cfec331ffaa764742399b
Reviewed-on: https://chromium-review.googlesource.com/c/1377853
Reviewed-by: Taiju Tsuiki <tzik@chromium.org>
Commit-Queue: Carlos Caballero <carlscab@google.com>
Cr-Commit-Position: refs/heads/master@{#623189}diff --git a/chrome/browser/sync_file_system/drive_backend/callback_helper_unittest.cc b/chrome/browser/sync_file_system/drive_backend/callback_helper_unittest.cc
index a3b6386..1dcbd43c 100644
--- a/chrome/browser/sync_file_system/drive_backend/callback_helper_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/callback_helper_unittest.cc
@@ -5,9 +5,9 @@
#include "chrome/browser/sync_file_system/drive_backend/callback_helper.h"
#include "base/location.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
+#include "base/test/scoped_task_environment.h"
#include "base/threading/thread.h"
#include "base/threading/thread_task_runner_handle.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -42,7 +42,7 @@
} // namespace
TEST(DriveBackendCallbackHelperTest, BasicTest) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
bool called = false;
RelayCallbackToCurrentThread(
@@ -62,7 +62,7 @@
}
TEST(DriveBackendCallbackHelperTest, RunOnOtherThreadTest) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
base::Thread thread("WorkerThread");
thread.Start();
@@ -90,7 +90,7 @@
}
TEST(DriveBackendCallbackHelperTest, PassNullFunctionTest) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
base::Closure closure = RelayCallbackToCurrentThread(
FROM_HERE,
base::Closure());
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
index d3b60d7..6517f12 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
@@ -12,10 +12,11 @@
#include "base/bind.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/message_loop/message_loop.h"
+
#include "base/run_loop.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
+#include "base/test/scoped_task_environment.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h"
#include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.h"
@@ -624,7 +625,7 @@
private:
base::ScopedTempDir database_dir_;
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
std::unique_ptr<leveldb::Env> in_memory_env_;
std::unique_ptr<MetadataDatabase> metadata_database_;
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 0485311..37e9e168 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
@@ -13,9 +13,9 @@
#include "base/location.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
+#include "base/test/scoped_task_environment.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/sync_file_system/drive_backend/sync_task.h"
#include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h"
@@ -296,7 +296,7 @@
} // namespace
TEST(SyncTaskManagerTest, ScheduleTask) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
TaskManagerClient client(0 /* maximum_background_task */);
int callback_count = 0;
SyncStatusCode callback_status = SYNC_STATUS_OK;
@@ -316,7 +316,7 @@
}
TEST(SyncTaskManagerTest, ScheduleTwoTasks) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
TaskManagerClient client(0 /* maximum_background_task */);
int callback_count = 0;
SyncStatusCode callback_status = SYNC_STATUS_OK;
@@ -339,7 +339,7 @@
}
TEST(SyncTaskManagerTest, ScheduleIdleTask) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
TaskManagerClient client(0 /* maximum_background_task */);
client.ScheduleTaskIfIdle(kStatus1);
@@ -353,7 +353,7 @@
}
TEST(SyncTaskManagerTest, ScheduleIdleTaskWhileNotIdle) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
TaskManagerClient client(0 /* maximum_background_task */);
int callback_count = 0;
SyncStatusCode callback_status = SYNC_STATUS_OK;
@@ -375,7 +375,7 @@
}
TEST(SyncTaskManagerTest, ScheduleAndCancelSyncTask) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
int callback_count = 0;
SyncStatusCode status = SYNC_STATUS_UNKNOWN;
@@ -404,7 +404,7 @@
}
TEST(SyncTaskManagerTest, ScheduleTaskAtPriority) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
SyncTaskManager task_manager(base::WeakPtr<SyncTaskManager::Client>(),
0 /* maximum_background_task */,
base::ThreadTaskRunnerHandle::Get());
@@ -465,7 +465,7 @@
}
TEST(SyncTaskManagerTest, BackgroundTask_Sequential) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
SyncTaskManager task_manager(base::WeakPtr<SyncTaskManager::Client>(),
10 /* maximum_background_task */,
base::ThreadTaskRunnerHandle::Get());
@@ -497,7 +497,7 @@
}
TEST(SyncTaskManagerTest, BackgroundTask_Parallel) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
SyncTaskManager task_manager(base::WeakPtr<SyncTaskManager::Client>(),
10 /* maximum_background_task */,
base::ThreadTaskRunnerHandle::Get());
@@ -529,7 +529,7 @@
}
TEST(SyncTaskManagerTest, BackgroundTask_Throttled) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
SyncTaskManager task_manager(base::WeakPtr<SyncTaskManager::Client>(),
2 /* maximum_background_task */,
base::ThreadTaskRunnerHandle::Get());
@@ -561,7 +561,7 @@
}
TEST(SyncTaskManagerTest, UpdateTaskBlocker) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment scoped_task_environment;
SyncTaskManager task_manager(base::WeakPtr<SyncTaskManager::Client>(),
10 /* maximum_background_task */,
base::ThreadTaskRunnerHandle::Get());
