Commit 41de8a87 authored by xiyuan@chromium.org's avatar xiyuan@chromium.org

Fix flaky AppsGridViewTest on valgrind bot (Strike 2).

There is also a page transition animation to wait for after timer is fired.

BUG=385167

Review URL: https://codereview.chromium.org/344793005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278591 0039d316-1c4b-4281-b951-d872f2087c98
parent dfc75134
...@@ -46,7 +46,8 @@ void AppsGridViewTestApi::DisableSynchronousDrag() { ...@@ -46,7 +46,8 @@ void AppsGridViewTestApi::DisableSynchronousDrag() {
} }
bool AppsGridViewTestApi::HasPendingPageFlip() const { bool AppsGridViewTestApi::HasPendingPageFlip() const {
return view_->page_flip_timer_.IsRunning(); return view_->page_flip_timer_.IsRunning() ||
view_->pagination_model()->has_transition();
} }
} // namespace test } // namespace test
......
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