Index: ui/views/corewm/focus_controller_unittest.cc |
diff --git a/ui/views/corewm/focus_controller_unittest.cc b/ui/views/corewm/focus_controller_unittest.cc |
index 349f517d7bd1d1bfae4c44bbd1666548b9f96487..097bd12bd64b34e853cb5a36bfbf6b29914564bb 100644 |
--- a/ui/views/corewm/focus_controller_unittest.cc |
+++ b/ui/views/corewm/focus_controller_unittest.cc |
@@ -20,6 +20,7 @@ |
#include "ui/aura/window_tracker.h" |
#include "ui/events/event_handler.h" |
#include "ui/views/corewm/base_focus_rules.h" |
+#include "ui/views/corewm/transient_window_stacking_client.h" |
namespace views { |
namespace corewm { |
@@ -213,6 +214,10 @@ class FocusControllerTestBase : public aura::test::AuraTestBase { |
// Overridden from aura::test::AuraTestBase: |
virtual void SetUp() OVERRIDE { |
+ // SetWindowStackingClient() takes ownership of |
+ // TransientWindowStackingClient. |
+ aura::client::SetWindowStackingClient( |
+ new corewm::TransientWindowStackingClient); |
// FocusController registers itself as an Env observer so it can catch all |
// window initializations, including the root_window()'s, so we create it |
// before allowing the base setup. |
@@ -259,6 +264,7 @@ class FocusControllerTestBase : public aura::test::AuraTestBase { |
aura::test::AuraTestBase::TearDown(); |
test_focus_rules_ = NULL; // Owned by FocusController. |
focus_controller_.reset(); |
+ aura::client::SetWindowStackingClient(NULL); |
} |
void FocusWindow(aura::Window* window) { |