| 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 cfccd056c978d063df9530e61aa50b789bd4fb4a..0632fa356e052143b6b4626b6790ed4af77feeed 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/wm_state.h"
|
|
|
| namespace views {
|
| namespace corewm {
|
| @@ -274,6 +275,7 @@ class FocusControllerTestBase : public aura::test::AuraTestBase {
|
|
|
| // Overridden from aura::test::AuraTestBase:
|
| virtual void SetUp() OVERRIDE {
|
| + wm_state_.reset(new views::corewm::WMState);
|
| // 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.
|
| @@ -320,6 +322,7 @@ class FocusControllerTestBase : public aura::test::AuraTestBase {
|
| aura::test::AuraTestBase::TearDown();
|
| test_focus_rules_ = NULL; // Owned by FocusController.
|
| focus_controller_.reset();
|
| + wm_state_.reset();
|
| }
|
|
|
| void FocusWindow(aura::Window* window) {
|
| @@ -371,6 +374,7 @@ class FocusControllerTestBase : public aura::test::AuraTestBase {
|
| private:
|
| scoped_ptr<FocusController> focus_controller_;
|
| TestFocusRules* test_focus_rules_;
|
| + scoped_ptr<views::corewm::WMState> wm_state_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FocusControllerTestBase);
|
| };
|
|
|