| Index: third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc
|
| diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc
|
| index 7422ede624c1791e046e9afeace40992471f5747..022f2cd8f4f22f2a2df17d90e3ef0e502b1e87e2 100644
|
| --- a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc
|
| +++ b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc
|
| @@ -2690,7 +2690,7 @@ TEST_F(RendererSchedulerImplTest,
|
| SimulateExpensiveTasks(loading_task_runner_);
|
| ForceTouchStartToBeExpectedSoon();
|
| scheduler_->AddPendingNavigation(
|
| - blink::WebScheduler::NavigatingFrameType::kChildFrame);
|
| + scheduler::RendererScheduler::NavigatingFrameType::kChildFrame);
|
|
|
| PostTestTasks(&run_order, "L1 D1");
|
| RunUntilIdle();
|
| @@ -2709,7 +2709,7 @@ TEST_F(RendererSchedulerImplTest,
|
| SimulateExpensiveTasks(loading_task_runner_);
|
| ForceTouchStartToBeExpectedSoon();
|
| scheduler_->AddPendingNavigation(
|
| - blink::WebScheduler::NavigatingFrameType::kMainFrame);
|
| + scheduler::RendererScheduler::NavigatingFrameType::kMainFrame);
|
|
|
| PostTestTasks(&run_order, "L1 D1");
|
| RunUntilIdle();
|
| @@ -2726,7 +2726,7 @@ TEST_F(RendererSchedulerImplTest,
|
| // After the nagigation has been cancelled, the expensive loading tasks should
|
| // get blocked.
|
| scheduler_->RemovePendingNavigation(
|
| - blink::WebScheduler::NavigatingFrameType::kMainFrame);
|
| + scheduler::RendererScheduler::NavigatingFrameType::kMainFrame);
|
| run_order.clear();
|
|
|
| PostTestTasks(&run_order, "L1 D1");
|
| @@ -2751,9 +2751,9 @@ TEST_F(RendererSchedulerImplTest,
|
| SimulateExpensiveTasks(loading_task_runner_);
|
| ForceTouchStartToBeExpectedSoon();
|
| scheduler_->AddPendingNavigation(
|
| - blink::WebScheduler::NavigatingFrameType::kMainFrame);
|
| + scheduler::RendererScheduler::NavigatingFrameType::kMainFrame);
|
| scheduler_->AddPendingNavigation(
|
| - blink::WebScheduler::NavigatingFrameType::kMainFrame);
|
| + scheduler::RendererScheduler::NavigatingFrameType::kMainFrame);
|
|
|
| PostTestTasks(&run_order, "L1 D1");
|
| RunUntilIdle();
|
| @@ -2769,7 +2769,7 @@ TEST_F(RendererSchedulerImplTest,
|
|
|
| run_order.clear();
|
| scheduler_->RemovePendingNavigation(
|
| - blink::WebScheduler::NavigatingFrameType::kMainFrame);
|
| + scheduler::RendererScheduler::NavigatingFrameType::kMainFrame);
|
| // Navigation task expected ref count non-zero so expensive tasks still not
|
| // blocked.
|
| PostTestTasks(&run_order, "L1 D1");
|
| @@ -2786,7 +2786,7 @@ TEST_F(RendererSchedulerImplTest,
|
|
|
| run_order.clear();
|
| scheduler_->RemovePendingNavigation(
|
| - blink::WebScheduler::NavigatingFrameType::kMainFrame);
|
| + scheduler::RendererScheduler::NavigatingFrameType::kMainFrame);
|
| // Navigation task expected ref count is now zero, the expensive loading tasks
|
| // should get blocked.
|
| PostTestTasks(&run_order, "L1 D1");
|
|
|