| Index: third_party/WebKit/Source/platform/scheduler/renderer/web_view_scheduler_impl_unittest.cc
|
| diff --git a/components/scheduler/renderer/web_view_scheduler_impl_unittest.cc b/third_party/WebKit/Source/platform/scheduler/renderer/web_view_scheduler_impl_unittest.cc
|
| similarity index 92%
|
| rename from components/scheduler/renderer/web_view_scheduler_impl_unittest.cc
|
| rename to third_party/WebKit/Source/platform/scheduler/renderer/web_view_scheduler_impl_unittest.cc
|
| index 403df5350f87f9af755b064fc1c103834ebd7144..4ddb4d5b77053e34567a1fc3c825334924b102da 100644
|
| --- a/components/scheduler/renderer/web_view_scheduler_impl_unittest.cc
|
| +++ b/third_party/WebKit/Source/platform/scheduler/renderer/web_view_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/web_view_scheduler_impl.h"
|
| +#include "platform/scheduler/renderer/web_view_scheduler_impl.h"
|
|
|
| #include <memory>
|
|
|
| @@ -10,18 +10,19 @@
|
| #include "base/memory/ptr_util.h"
|
| #include "base/test/simple_test_tick_clock.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/renderer/renderer_scheduler_impl.h"
|
| -#include "components/scheduler/renderer/web_frame_scheduler_impl.h"
|
| +#include "platform/scheduler/base/test_time_source.h"
|
| +#include "platform/scheduler/child/scheduler_tqm_delegate_for_test.h"
|
| +#include "platform/scheduler/renderer/renderer_scheduler_impl.h"
|
| +#include "platform/scheduler/renderer/web_frame_scheduler_impl.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| -#include "third_party/WebKit/public/platform/WebTaskRunner.h"
|
| -#include "third_party/WebKit/public/platform/WebTraceLocation.h"
|
| +#include "public/platform/WebTaskRunner.h"
|
| +#include "public/platform/WebTraceLocation.h"
|
|
|
| using testing::ElementsAre;
|
| using VirtualTimePolicy = blink::WebViewScheduler::VirtualTimePolicy;
|
|
|
| +namespace blink {
|
| namespace scheduler {
|
|
|
| class WebViewSchedulerImplTest : public testing::Test {
|
| @@ -221,12 +222,11 @@ TEST_F(WebViewSchedulerImplTest, VirtualTime_TimerFastForwarding) {
|
|
|
| mock_task_runner_->RunUntilIdle();
|
|
|
| - EXPECT_THAT(real_times, ElementsAre(initial_real_time,
|
| - initial_real_time, initial_real_time));
|
| - EXPECT_THAT(virtual_times_ms,
|
| - ElementsAre(initial_virtual_time_ms + 2,
|
| - initial_virtual_time_ms + 20,
|
| - initial_virtual_time_ms + 200));
|
| + EXPECT_THAT(real_times, ElementsAre(initial_real_time, initial_real_time,
|
| + initial_real_time));
|
| + EXPECT_THAT(virtual_times_ms, ElementsAre(initial_virtual_time_ms + 2,
|
| + initial_virtual_time_ms + 20,
|
| + initial_virtual_time_ms + 200));
|
| }
|
|
|
| TEST_F(WebViewSchedulerImplTest, VirtualTime_LoadingTaskFastForwarding) {
|
| @@ -263,12 +263,11 @@ TEST_F(WebViewSchedulerImplTest, VirtualTime_LoadingTaskFastForwarding) {
|
|
|
| mock_task_runner_->RunUntilIdle();
|
|
|
| - EXPECT_THAT(real_times, ElementsAre(initial_real_time,
|
| - initial_real_time, initial_real_time));
|
| - EXPECT_THAT(virtual_times_ms,
|
| - ElementsAre(initial_virtual_time_ms + 2,
|
| - initial_virtual_time_ms + 20,
|
| - initial_virtual_time_ms + 200));
|
| + EXPECT_THAT(real_times, ElementsAre(initial_real_time, initial_real_time,
|
| + initial_real_time));
|
| + EXPECT_THAT(virtual_times_ms, ElementsAre(initial_virtual_time_ms + 2,
|
| + initial_virtual_time_ms + 20,
|
| + initial_virtual_time_ms + 200));
|
| }
|
|
|
| TEST_F(WebViewSchedulerImplTest,
|
| @@ -296,14 +295,11 @@ namespace {
|
| class RunOrderTask : public blink::WebTaskRunner::Task {
|
| public:
|
| RunOrderTask(int index, std::vector<int>* out_run_order)
|
| - : index_(index),
|
| - out_run_order_(out_run_order) {}
|
| + : index_(index), out_run_order_(out_run_order) {}
|
|
|
| ~RunOrderTask() override {}
|
|
|
| - void run() override {
|
| - out_run_order_->push_back(index_);
|
| - }
|
| + void run() override { out_run_order_->push_back(index_); }
|
|
|
| private:
|
| int index_;
|
| @@ -312,7 +308,8 @@ class RunOrderTask : public blink::WebTaskRunner::Task {
|
|
|
| class DelayedRunOrderTask : public blink::WebTaskRunner::Task {
|
| public:
|
| - DelayedRunOrderTask(int index, blink::WebTaskRunner* task_runner,
|
| + DelayedRunOrderTask(int index,
|
| + blink::WebTaskRunner* task_runner,
|
| std::vector<int>* out_run_order)
|
| : index_(index),
|
| task_runner_(task_runner),
|
| @@ -322,8 +319,8 @@ class DelayedRunOrderTask : public blink::WebTaskRunner::Task {
|
|
|
| void run() override {
|
| out_run_order_->push_back(index_);
|
| - task_runner_->postTask(
|
| - BLINK_FROM_HERE, new RunOrderTask(index_ + 1, out_run_order_));
|
| + task_runner_->postTask(BLINK_FROM_HERE,
|
| + new RunOrderTask(index_ + 1, out_run_order_));
|
| }
|
|
|
| private:
|
| @@ -590,3 +587,4 @@ TEST_F(WebViewSchedulerImplTest, BackgroundParser_DETERMINISTIC_LOADING) {
|
| }
|
|
|
| } // namespace scheduler
|
| +} // namespace blink
|
|
|