Refactor WorkerPoolCreationArgs to a Read-Only WorkerPoolParams

base/task_scheduler/task_scheduler_impl_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/task_scheduler/task_scheduler_impl.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #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"
 #include "base/threading/simple_thread.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace internal {
@@ skipping 122 matching lines @@
   return traits.priority() == TaskPriority::BACKGROUND ? BACKGROUND_WORKER_POOL
                                                        : FOREGROUND_WORKER_POOL;
 }
 
 class TaskSchedulerImplTest
     : public testing::TestWithParam<TraitsExecutionModePair> {
  protected:
   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_);
   }
 
   void TearDown() override { scheduler_->JoinForTesting(); }
 
   std::unique_ptr<TaskSchedulerImpl> scheduler_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TaskSchedulerImplTest);
@@ skipping 54 matching lines @@
     thread->WaitForAllTasksToRun();
     thread->Join();
   }
 }
 
 // TODO(fdoray): Add tests with Sequences that move around worker pools once
 // child TaskRunners are supported.
 
 }  // namespace internal
 }  // namespace base