| Index: content/browser/web_contents/web_contents_view_aura_browsertest.cc
|
| diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
|
| index d76480b53894d1fc72cb08b85db84beaa17fc3bf..476bec6df0e2373bf9b5b56bf6ff16295b4b04cc 100644
|
| --- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc
|
| +++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
|
| @@ -23,6 +23,7 @@
|
| #include "ui/aura/root_window.h"
|
| #include "ui/aura/test/event_generator.h"
|
| #include "ui/aura/window.h"
|
| +#include "ui/compositor/scoped_animation_duration_scale_mode.h"
|
|
|
| namespace content {
|
|
|
| @@ -220,6 +221,11 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
|
| RenderViewHostImpl* view_host = static_cast<RenderViewHostImpl*>(
|
| web_contents->GetRenderViewHost());
|
|
|
| + // This test triggers a large number of animations. Speed them up to ensure
|
| + // the test completes within its time limit.
|
| + ui::ScopedAnimationDurationScaleMode fast_duration_mode(
|
| + ui::ScopedAnimationDurationScaleMode::FAST_DURATION);
|
| +
|
| // Make sure the page has both back/forward history.
|
| ExecuteSyncJSFunction(view_host, "navigate_next()");
|
| EXPECT_EQ(1, GetCurrentIndex());
|
|
|