Moves management of transients out of Window

chrome/test/base/view_event_test_base.cc

Index: chrome/test/base/view_event_test_base.cc
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index d88bf9cb214502811bd8199b2e2a1d0c180c4f7f..4b2c8c1121bb796fd53faeb5f2b744644b7f8468 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -31,6 +31,7 @@
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_helper.h"
+#include "ui/views/corewm/transient_window_stacking_client.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ -99,6 +100,12 @@ void ViewEventTestBase::Done() {
 }
 
 void ViewEventTestBase::SetUp() {
+#if defined(USE_AURA)
+  // SetWindowStackingClient() takes ownership of TransientWindowStackingClient.
+  aura::client::SetWindowStackingClient(
+      new views::corewm::TransientWindowStackingClient);
+#endif
+
   views::ViewsDelegate::views_delegate = &views_delegate_;
   ui::InitializeInputMethodForTesting();
   gfx::NativeView context = NULL;
@@ -171,6 +178,10 @@ void ViewEventTestBase::TearDown() {
 
   ui::ShutdownInputMethodForTesting();
   views::ViewsDelegate::views_delegate = NULL;
+
+#if defined(USE_AURA)
+  aura::client::SetWindowStackingClient(NULL);
+#endif
 }
 
 bool ViewEventTestBase::CanResize() const {