Commit f08ca564 authored by Xiaoqian Dai's avatar Xiaoqian Dai Committed by Commit Bot

Fix the test flakiness DragWindowFromShelfControllerTest.FlingWithHiddenHotseat

Bug: 1023162
Change-Id: Ia8d07cf6ea1742c27b781d5214e47b347e7d3317
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1906458Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Xiaoqian Dai <xdai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714325}
parent 38612283
...@@ -35,6 +35,13 @@ class DragWindowFromShelfControllerTest : public AshTestBase { ...@@ -35,6 +35,13 @@ class DragWindowFromShelfControllerTest : public AshTestBase {
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
} }
void TearDown() override {
// Destroy |window_drag_controller_| so that its scheduled task won't get
// run after the test environment is gone.
window_drag_controller_.reset();
AshTestBase::TearDown();
}
void StartDrag(aura::Window* window, void StartDrag(aura::Window* window,
const gfx::Point& location_in_screen, const gfx::Point& location_in_screen,
HotseatState hotseat_state) { HotseatState hotseat_state) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment