| 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 0ee313bdbbd73785781337d97ac016771caa882d..ec488b96963dcad72cbbb9d8f1dc4b04175a2d67 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>
|
|
|
| @@ -13,13 +13,14 @@
|
| #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 "components/scheduler/renderer/auto_advancing_virtual_time_domain.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 "platform/scheduler/renderer/auto_advancing_virtual_time_domain.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| +namespace blink {
|
| namespace scheduler {
|
|
|
| namespace {
|
| @@ -48,8 +49,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,
|
| @@ -1834,8 +1834,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) {
|
| @@ -2457,8 +2458,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());
|
| }
|
|
|
| @@ -2545,9 +2546,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();
|
| @@ -2571,7 +2571,6 @@ TEST_F(
|
| EXPECT_THAT(run_order,
|
| testing::ElementsAre(std::string("L1"), std::string("D1")));
|
|
|
| -
|
| run_order.clear();
|
| scheduler_->RemovePendingNavigation(
|
| blink::WebScheduler::NavigatingFrameType::kMainFrame);
|
| @@ -2589,7 +2588,6 @@ TEST_F(
|
| EXPECT_THAT(run_order,
|
| testing::ElementsAre(std::string("L1"), std::string("D1")));
|
|
|
| -
|
| run_order.clear();
|
| scheduler_->RemovePendingNavigation(
|
| blink::WebScheduler::NavigatingFrameType::kMainFrame);
|
| @@ -2854,16 +2852,16 @@ class WebViewSchedulerImplForTest : public WebViewSchedulerImpl {
|
| : WebViewSchedulerImpl(nullptr, scheduler, false) {}
|
| ~WebViewSchedulerImplForTest() override {}
|
|
|
| - void AddConsoleWarning(const std::string& message) override {
|
| - console_warnings_.push_back(message);
|
| + void ReportIntervention(const std::string& message) override {
|
| + interventions_.push_back(message);
|
| }
|
|
|
| - const std::vector<std::string>& console_warnings() const {
|
| - return console_warnings_;
|
| + const std::vector<std::string>& interventions() const {
|
| + return interventions_;
|
| }
|
|
|
| private:
|
| - std::vector<std::string> console_warnings_;
|
| + std::vector<std::string> interventions_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WebViewSchedulerImplForTest);
|
| };
|
| @@ -2885,9 +2883,9 @@ TEST_F(RendererSchedulerImplTest, BlockedTimerNotification) {
|
| RunUntilIdle();
|
|
|
| EXPECT_EQ(0u, run_order.size());
|
| - EXPECT_EQ(1u, web_view_scheduler.console_warnings().size());
|
| + EXPECT_EQ(1u, web_view_scheduler.interventions().size());
|
| EXPECT_NE(std::string::npos,
|
| - web_view_scheduler.console_warnings()[0].find("crbug.com/574343"));
|
| + web_view_scheduler.interventions()[0].find("crbug.com/574343"));
|
| }
|
|
|
| TEST_F(RendererSchedulerImplTest,
|
| @@ -2909,7 +2907,7 @@ TEST_F(RendererSchedulerImplTest,
|
| RunUntilIdle();
|
|
|
| EXPECT_EQ(0u, run_order.size());
|
| - EXPECT_EQ(0u, web_view_scheduler.console_warnings().size());
|
| + EXPECT_EQ(0u, web_view_scheduler.interventions().size());
|
| }
|
|
|
| TEST_F(RendererSchedulerImplTest, BlockedTimerNotification_TimersSuspended) {
|
| @@ -2930,7 +2928,7 @@ TEST_F(RendererSchedulerImplTest, BlockedTimerNotification_TimersSuspended) {
|
| RunUntilIdle();
|
|
|
| EXPECT_EQ(0u, run_order.size());
|
| - EXPECT_EQ(0u, web_view_scheduler.console_warnings().size());
|
| + EXPECT_EQ(0u, web_view_scheduler.interventions().size());
|
| }
|
|
|
| TEST_F(RendererSchedulerImplTest, BlockedTimerNotification_TOUCHSTART) {
|
| @@ -2951,7 +2949,7 @@ TEST_F(RendererSchedulerImplTest, BlockedTimerNotification_TOUCHSTART) {
|
| RunUntilIdle();
|
|
|
| EXPECT_EQ(0u, run_order.size());
|
| - EXPECT_EQ(0u, web_view_scheduler.console_warnings().size());
|
| + EXPECT_EQ(0u, web_view_scheduler.interventions().size());
|
| }
|
|
|
| TEST_F(RendererSchedulerImplTest,
|
| @@ -2978,7 +2976,7 @@ TEST_F(RendererSchedulerImplTest,
|
| RunUntilIdle();
|
|
|
| EXPECT_EQ(0u, run_order.size());
|
| - EXPECT_EQ(0u, web_view_scheduler.console_warnings().size());
|
| + EXPECT_EQ(0u, web_view_scheduler.interventions().size());
|
| }
|
|
|
| namespace {
|
| @@ -3446,3 +3444,4 @@ TEST_F(RendererSchedulerImplTest, EnableVirtualTime) {
|
| }
|
|
|
| } // namespace scheduler
|
| +} // namespace blink
|
|
|