| 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 e5af8a1dfc79938296c0cdc0faf66c403b24176a..be058ef2d994d09cdc6075bf3ae7ace7a88b5715 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/wm_state.h"
|
| #endif
|
|
|
| #if defined(OS_CHROMEOS)
|
| @@ -100,6 +101,10 @@ void ViewEventTestBase::Done() {
|
| }
|
|
|
| void ViewEventTestBase::SetUp() {
|
| +#if defined(USE_AURA)
|
| + wm_state_.reset(new views::corewm::WMState);
|
| +#endif
|
| +
|
| views::ViewsDelegate::views_delegate = &views_delegate_;
|
| ui::InitializeInputMethodForTesting();
|
| gfx::NativeView context = NULL;
|
| @@ -174,6 +179,10 @@ void ViewEventTestBase::TearDown() {
|
|
|
| ui::ShutdownInputMethodForTesting();
|
| views::ViewsDelegate::views_delegate = NULL;
|
| +
|
| +#if defined(USE_AURA)
|
| + wm_state_.reset();
|
| +#endif
|
| }
|
|
|
| bool ViewEventTestBase::CanResize() const {
|
|
|