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 fa9f3bde7fcd7eac25ac3d8ff5197bd2fa574b09..d4f85238b1ae29ad511069a9f408fb2a20860ccd 100644 |
--- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc |
+++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc |
@@ -31,6 +31,7 @@ |
#include "ui/aura/window.h" |
#include "ui/aura/window_tree_host.h" |
#include "ui/compositor/scoped_animation_duration_scale_mode.h" |
+#include "ui/compositor/test/draw_waiter_for_test.h" |
#include "ui/events/event_processor.h" |
#include "ui/events/event_utils.h" |
@@ -262,6 +263,15 @@ class WebContentsViewAuraTest : public ContentBrowserTest { |
} |
private: |
+ // BrowserTestBase: |
+ virtual void TearDownOnMainThread() OVERRIDE { |
+ aura::Window* window = shell()->web_contents()->GetNativeView(); |
+ ui::Compositor* compositor = window->layer()->GetCompositor(); |
+ while (compositor->layer_animator_collection()->HasActiveAnimators()) |
+ ui::DrawWaiterForTest::Wait(compositor); |
sky
2014/06/03 13:19:15
This seems easy to miss. Who owns these animations
sadrul
2014/06/03 18:35:04
This CL was reverted (along with the original CL).
|
+ ContentBrowserTest::TearDownOnMainThread(); |
+ } |
+ |
ScreenshotTracker* screenshot_manager_; |
DISALLOW_COPY_AND_ASSIGN(WebContentsViewAuraTest); |