| Index: ash/test/ash_test_helper.cc
|
| diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
|
| index 6cff6baf4df6726b0cc66256999753c27850bf95..f362f6773709df06198c0c03d0007ab8d4bc5cf1 100644
|
| --- a/ash/test/ash_test_helper.cc
|
| +++ b/ash/test/ash_test_helper.cc
|
| @@ -49,6 +49,10 @@ AshTestHelper::~AshTestHelper() {
|
| }
|
|
|
| void AshTestHelper::SetUp(bool start_session) {
|
| + // SetWindowStackingClient() takes ownership of TransientWindowStackingClient.
|
| + aura::client::SetWindowStackingClient(
|
| + new views::corewm::TransientWindowStackingClient);
|
| +
|
| // Disable animations during tests.
|
| zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
|
| ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
|
| @@ -88,10 +92,6 @@ void AshTestHelper::SetUp(bool start_session) {
|
| test_screenshot_delegate_ = new TestScreenshotDelegate();
|
| shell->accelerator_controller()->SetScreenshotDelegate(
|
| scoped_ptr<ScreenshotDelegate>(test_screenshot_delegate_));
|
| -
|
| - // SetWindowStackingClient() takes ownership of TransientWindowStackingClient.
|
| - aura::client::SetWindowStackingClient(
|
| - new views::corewm::TransientWindowStackingClient);
|
| }
|
|
|
| void AshTestHelper::TearDown() {
|
|
|