| Index: third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc
|
| diff --git a/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc
|
| similarity index 99%
|
| rename from components/scheduler/renderer/renderer_scheduler_impl_unittest.cc
|
| rename to third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc
|
| index 2e96d2f94ed8e99ce4dcd076f79a743657e010ed..df8fd2866e8036800b82c55377ec0bed39855b26 100644
|
| --- a/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc
|
| +++ b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_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/renderer/renderer_scheduler_impl.h"
|
| +#include "platform/scheduler/renderer/renderer_scheduler_impl.h"
|
|
|
| #include <utility>
|
|
|
| @@ -12,12 +12,13 @@
|
| #include "base/test/simple_test_tick_clock.h"
|
| #include "cc/output/begin_frame_args.h"
|
| #include "cc/test/ordered_simple_task_runner.h"
|
| -#include "components/scheduler/base/test_time_source.h"
|
| -#include "components/scheduler/child/scheduler_tqm_delegate_for_test.h"
|
| -#include "components/scheduler/child/scheduler_tqm_delegate_impl.h"
|
| +#include "platform/scheduler/base/test_time_source.h"
|
| +#include "platform/scheduler/child/scheduler_tqm_delegate_for_test.h"
|
| +#include "platform/scheduler/child/scheduler_tqm_delegate_impl.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| +namespace blink {
|
| namespace scheduler {
|
|
|
| namespace {
|
| @@ -46,8 +47,7 @@ void AppendToVectorIdleTestTask(std::vector<std::string>* vector,
|
| AppendToVectorTestTask(vector, value);
|
| }
|
|
|
| -void NullTask() {
|
| -}
|
| +void NullTask() {}
|
|
|
| void AppendToVectorReentrantTask(base::SingleThreadTaskRunner* task_runner,
|
| std::vector<int>* vector,
|
| @@ -1832,8 +1832,9 @@ class RendererSchedulerImplWithMessageLoopTest
|
| : RendererSchedulerImplTest(new base::MessageLoop()) {}
|
| ~RendererSchedulerImplWithMessageLoopTest() override {}
|
|
|
| - void PostFromNestedRunloop(std::vector<
|
| - std::pair<SingleThreadIdleTaskRunner::IdleTask, bool>>* tasks) {
|
| + void PostFromNestedRunloop(
|
| + std::vector<std::pair<SingleThreadIdleTaskRunner::IdleTask, bool>>*
|
| + tasks) {
|
| base::MessageLoop::ScopedNestableTaskAllower allow(message_loop_.get());
|
| for (std::pair<SingleThreadIdleTaskRunner::IdleTask, bool>& pair : *tasks) {
|
| if (pair.second) {
|
| @@ -2455,8 +2456,8 @@ TEST_F(RendererSchedulerImplTest,
|
| EXPECT_FALSE(LoadingTasksSeemExpensive());
|
| EXPECT_TRUE(TimerTasksSeemExpensive());
|
| EXPECT_TRUE(TouchStartExpectedSoon());
|
| - EXPECT_THAT(run_order, testing::ElementsAre(std::string("T1"),
|
| - std::string("D1")));
|
| + EXPECT_THAT(run_order,
|
| + testing::ElementsAre(std::string("T1"), std::string("D1")));
|
| EXPECT_EQ(v8::PERFORMANCE_RESPONSE, RAILMode());
|
| }
|
|
|
| @@ -2543,9 +2544,8 @@ TEST_F(RendererSchedulerImplTest,
|
| EXPECT_EQ(v8::PERFORMANCE_RESPONSE, RAILMode());
|
| }
|
|
|
| -TEST_F(
|
| - RendererSchedulerImplTest,
|
| - ExpensiveLoadingTasksNotBlockedIfMainFrameNavigationExpected_Multiple) {
|
| +TEST_F(RendererSchedulerImplTest,
|
| + ExpensiveLoadingTasksNotBlockedIfMainFrameNavigationExpected_Multiple) {
|
| std::vector<std::string> run_order;
|
|
|
| DoMainFrame();
|
| @@ -2569,7 +2569,6 @@ TEST_F(
|
| EXPECT_THAT(run_order,
|
| testing::ElementsAre(std::string("L1"), std::string("D1")));
|
|
|
| -
|
| run_order.clear();
|
| scheduler_->RemovePendingNavigation(
|
| blink::WebScheduler::NavigatingFrameType::kMainFrame);
|
| @@ -2587,7 +2586,6 @@ TEST_F(
|
| EXPECT_THAT(run_order,
|
| testing::ElementsAre(std::string("L1"), std::string("D1")));
|
|
|
| -
|
| run_order.clear();
|
| scheduler_->RemovePendingNavigation(
|
| blink::WebScheduler::NavigatingFrameType::kMainFrame);
|
| @@ -3413,3 +3411,4 @@ TEST_F(RendererSchedulerImplTest, UnthrottledTaskRunner) {
|
| }
|
|
|
| } // namespace scheduler
|
| +} // namespace blink
|
|
|