Index: base/task_scheduler/task_scheduler_impl_unittest.cc |
diff --git a/base/task_scheduler/task_scheduler_impl_unittest.cc b/base/task_scheduler/task_scheduler_impl_unittest.cc |
index c14056ca670053a6c1f566a6ee19eca240f2feda..aa519a8ee054e26cc9c369a0e9d3395ff8bd5f2b 100644 |
--- a/base/task_scheduler/task_scheduler_impl_unittest.cc |
+++ b/base/task_scheduler/task_scheduler_impl_unittest.cc |
@@ -16,6 +16,7 @@ |
#include "base/macros.h" |
#include "base/memory/ptr_util.h" |
#include "base/synchronization/waitable_event.h" |
+#include "base/task_scheduler/scheduler_worker_pool_params.h" |
#include "base/task_scheduler/task_traits.h" |
#include "base/task_scheduler/test_task_factory.h" |
#include "base/threading/platform_thread.h" |
@@ -158,30 +159,27 @@ class TaskSchedulerImplTest |
TaskSchedulerImplTest() = default; |
void SetUp() override { |
- using IORestriction = SchedulerWorkerPoolImpl::IORestriction; |
+ using IORestriction = SchedulerWorkerPoolParams::IORestriction; |
- std::vector<TaskSchedulerImpl::WorkerPoolCreationArgs> worker_pools; |
+ std::vector<SchedulerWorkerPoolParams> params; |
gab
2016/07/20 01:08:27
|params_list| to follow suggestions elsewhere
robliao
2016/07/20 17:24:27
Done.
|
- ASSERT_EQ(BACKGROUND_WORKER_POOL, worker_pools.size()); |
- worker_pools.push_back({"TaskSchedulerBackground", |
- ThreadPriority::BACKGROUND, |
- IORestriction::DISALLOWED, 1U}); |
+ ASSERT_EQ(BACKGROUND_WORKER_POOL, params.size()); |
+ params.emplace_back("TaskSchedulerBackground", ThreadPriority::BACKGROUND, |
+ IORestriction::DISALLOWED, 1U); |
- ASSERT_EQ(BACKGROUND_FILE_IO_WORKER_POOL, worker_pools.size()); |
- worker_pools.push_back({"TaskSchedulerBackgroundFileIO", |
- ThreadPriority::BACKGROUND, IORestriction::ALLOWED, |
- 3U}); |
+ ASSERT_EQ(BACKGROUND_FILE_IO_WORKER_POOL, params.size()); |
+ params.emplace_back("TaskSchedulerBackgroundFileIO", |
+ ThreadPriority::BACKGROUND, IORestriction::ALLOWED, 3U); |
- ASSERT_EQ(FOREGROUND_WORKER_POOL, worker_pools.size()); |
- worker_pools.push_back({"TaskSchedulerForeground", ThreadPriority::NORMAL, |
- IORestriction::DISALLOWED, 4U}); |
+ ASSERT_EQ(FOREGROUND_WORKER_POOL, params.size()); |
+ params.emplace_back("TaskSchedulerForeground", ThreadPriority::NORMAL, |
+ IORestriction::DISALLOWED, 4U); |
- ASSERT_EQ(FOREGROUND_FILE_IO_WORKER_POOL, worker_pools.size()); |
- worker_pools.push_back({"TaskSchedulerForegroundFileIO", |
- ThreadPriority::NORMAL, IORestriction::ALLOWED, |
- 12U}); |
+ ASSERT_EQ(FOREGROUND_FILE_IO_WORKER_POOL, params.size()); |
+ params.emplace_back("TaskSchedulerForegroundFileIO", ThreadPriority::NORMAL, |
+ IORestriction::ALLOWED, 12U); |
- scheduler_ = TaskSchedulerImpl::Create(worker_pools, |
+ scheduler_ = TaskSchedulerImpl::Create(params, |
Bind(&GetThreadPoolIndexForTraits)); |
ASSERT_TRUE(scheduler_); |
} |