| Index: third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc
|
| diff --git a/components/scheduler/base/task_queue_manager_unittest.cc b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc
|
| similarity index 97%
|
| rename from components/scheduler/base/task_queue_manager_unittest.cc
|
| rename to third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc
|
| index 8f37a1f0cd31db788a8b75d9a5674f8ad7f6a876..5e3ecf5790a4cbbe5d1b2259ed1056cc4115f7f9 100644
|
| --- a/components/scheduler/base/task_queue_manager_unittest.cc
|
| +++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "components/scheduler/base/task_queue_manager.h"
|
| +#include "platform/scheduler/base/task_queue_manager.h"
|
|
|
| #include <stddef.h>
|
|
|
| @@ -19,23 +19,24 @@
|
| #include "base/trace_event/blame_context.h"
|
| #include "base/trace_event/trace_buffer.h"
|
| #include "cc/test/ordered_simple_task_runner.h"
|
| -#include "components/scheduler/base/real_time_domain.h"
|
| -#include "components/scheduler/base/task_queue_impl.h"
|
| -#include "components/scheduler/base/task_queue_manager_delegate_for_test.h"
|
| -#include "components/scheduler/base/task_queue_selector.h"
|
| -#include "components/scheduler/base/test_count_uses_time_source.h"
|
| -#include "components/scheduler/base/test_task_time_tracker.h"
|
| -#include "components/scheduler/base/test_time_source.h"
|
| -#include "components/scheduler/base/virtual_time_domain.h"
|
| -#include "components/scheduler/base/work_queue.h"
|
| -#include "components/scheduler/base/work_queue_sets.h"
|
| +#include "platform/scheduler/base/real_time_domain.h"
|
| +#include "platform/scheduler/base/task_queue_impl.h"
|
| +#include "platform/scheduler/base/task_queue_manager_delegate_for_test.h"
|
| +#include "platform/scheduler/base/task_queue_selector.h"
|
| +#include "platform/scheduler/base/test_count_uses_time_source.h"
|
| +#include "platform/scheduler/base/test_task_time_tracker.h"
|
| +#include "platform/scheduler/base/test_time_source.h"
|
| +#include "platform/scheduler/base/virtual_time_domain.h"
|
| +#include "platform/scheduler/base/work_queue.h"
|
| +#include "platform/scheduler/base/work_queue_sets.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| using testing::ElementsAre;
|
| using testing::ElementsAreArray;
|
| using testing::_;
|
| -using scheduler::internal::EnqueueOrder;
|
| +using blink::scheduler::internal::EnqueueOrder;
|
|
|
| +namespace blink {
|
| namespace scheduler {
|
|
|
| class MessageLoopTaskRunner : public TaskQueueManagerDelegateForTest {
|
| @@ -72,9 +73,9 @@ class TaskQueueManagerTest : public testing::Test {
|
| test_task_runner_.get(),
|
| base::WrapUnique(new TestTimeSource(now_src_.get())));
|
|
|
| - manager_ = base::WrapUnique(new TaskQueueManager(
|
| - main_task_runner_, "test.scheduler", "test.scheduler",
|
| - "test.scheduler.debug"));
|
| + manager_ = base::WrapUnique(
|
| + new TaskQueueManager(main_task_runner_, "test.scheduler",
|
| + "test.scheduler", "test.scheduler.debug"));
|
| manager_->SetTaskTimeTracker(&test_task_time_tracker_);
|
|
|
| for (size_t i = 0; i < num_queues; i++)
|
| @@ -161,8 +162,7 @@ TEST_F(TaskQueueManagerTest,
|
| EXPECT_EQ(7, test_count_uses_time_source->now_calls_count());
|
| }
|
|
|
| -TEST_F(TaskQueueManagerTest,
|
| - NowNotCalledForNestedTasks) {
|
| +TEST_F(TaskQueueManagerTest, NowNotCalledForNestedTasks) {
|
| message_loop_.reset(new base::MessageLoop());
|
| // This memory is managed by the TaskQueueManager, but we need to hold a
|
| // pointer to this object to read out how many times Now was called.
|
| @@ -1168,16 +1168,14 @@ TEST_F(TaskQueueManagerTest, ImmediateAndDelayedTaskInterleaving) {
|
| for (int i = 10; i < 19; i++) {
|
| runners_[0]->PostDelayedTask(
|
| FROM_HERE,
|
| - base::Bind(&ExpensiveTestTask, i, now_src_.get(), &run_order),
|
| - delay);
|
| + base::Bind(&ExpensiveTestTask, i, now_src_.get(), &run_order), delay);
|
| }
|
|
|
| test_task_runner_->RunForPeriod(delay);
|
|
|
| for (int i = 0; i < 9; i++) {
|
| - runners_[0]->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(&ExpensiveTestTask, i, now_src_.get(), &run_order));
|
| + runners_[0]->PostTask(FROM_HERE, base::Bind(&ExpensiveTestTask, i,
|
| + now_src_.get(), &run_order));
|
| }
|
|
|
| test_task_runner_->SetAutoAdvanceNowToPendingTasks(true);
|
| @@ -1185,9 +1183,8 @@ TEST_F(TaskQueueManagerTest, ImmediateAndDelayedTaskInterleaving) {
|
|
|
| // Delayed tasks are not allowed to starve out immediate work which is why
|
| // some of the immediate tasks run out of order.
|
| - int expected_run_order[] = {
|
| - 10, 11, 12, 13, 0, 14, 15, 16, 1, 17, 18, 2, 3, 4, 5, 6, 7, 8
|
| - };
|
| + int expected_run_order[] = {10, 11, 12, 13, 0, 14, 15, 16, 1,
|
| + 17, 18, 2, 3, 4, 5, 6, 7, 8};
|
| EXPECT_THAT(run_order, ElementsAreArray(expected_run_order));
|
| }
|
|
|
| @@ -1516,9 +1513,10 @@ TEST_F(TaskQueueManagerTest, UnregisterTaskQueueInNestedLoop) {
|
| std::make_pair(base::Bind(&HasOneRefTask, base::Unretained(&log),
|
| base::Unretained(task_queue.get())),
|
| true));
|
| - tasks_to_post_from_nested_loop.push_back(std::make_pair(
|
| - base::Bind(&internal::TaskQueueImpl::UnregisterTaskQueue,
|
| - base::Unretained(task_queue.get())), true));
|
| + tasks_to_post_from_nested_loop.push_back(
|
| + std::make_pair(base::Bind(&internal::TaskQueueImpl::UnregisterTaskQueue,
|
| + base::Unretained(task_queue.get())),
|
| + true));
|
| tasks_to_post_from_nested_loop.push_back(
|
| std::make_pair(base::Bind(&HasOneRefTask, base::Unretained(&log),
|
| base::Unretained(task_queue.get())),
|
| @@ -1865,8 +1863,9 @@ TEST_F(TaskQueueManagerTest, CurrentlyExecutingTaskQueue_NoTaskRunning) {
|
| }
|
|
|
| namespace {
|
| -void CurrentlyExecutingTaskQueueTestTask(TaskQueueManager* task_queue_manager,
|
| - std::vector<TaskQueue*>* task_sources) {
|
| +void CurrentlyExecutingTaskQueueTestTask(
|
| + TaskQueueManager* task_queue_manager,
|
| + std::vector<TaskQueue*>* task_sources) {
|
| task_sources->push_back(task_queue_manager->currently_executing_task_queue());
|
| }
|
| }
|
| @@ -2006,3 +2005,4 @@ TEST_F(TaskQueueManagerTestWithTracing, BlameContextAttribution) {
|
| }
|
|
|
| } // namespace scheduler
|
| +} // namespace blink
|
|
|