Moves management of transients out of Window

ash/test/ash_test_helper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/test/ash_test_helper.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/test/display_manager_test_api.h"
@@ skipping 31 matching lines @@
   CHECK(message_loop_);
 #if defined(USE_X11)
   aura::test::SetUseOverrideRedirectWindowByDefault(true);
 #endif
 }
 
 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));
   ui::InitializeInputMethodForTesting();
 
   bool allow_test_contexts = true;
   ui::InitializeContextFactoryForTests(allow_test_contexts);
 
   // Creates Shell and hook with Desktop.
   test_shell_delegate_ = new TestShellDelegate;
@@ skipping 19 matching lines @@
         SetHasActiveUser(true);
   }
 
   test::DisplayManagerTestApi(shell->display_manager()).
       DisableChangeDisplayUponHostResize();
   ShellTestApi(shell).DisableOutputConfiguratorAnimation();
 
   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() {
   // Tear down the shell.
   Shell::DeleteInstance();
   test_screenshot_delegate_ = NULL;
 
   // Remove global message center state.
   message_center::MessageCenter::Shutdown();
 
@@ skipping 25 matching lines @@
 aura::Window* AshTestHelper::CurrentContext() {
   aura::Window* root_window = Shell::GetTargetRootWindow();
   if (!root_window)
     root_window = Shell::GetPrimaryRootWindow();
   DCHECK(root_window);
   return root_window;
 }
 
 }  // namespace test
 }  // namespace ash