| 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 d8604c94b4b55f2b9b8743345bd12d2088c152ab..d2ace62167f8e59d71ff36337a2ed0eedd3983a1 100644
|
| --- a/chrome/test/base/view_event_test_base.cc
|
| +++ b/chrome/test/base/view_event_test_base.cc
|
| @@ -12,12 +12,19 @@
|
| #include "chrome/test/base/interactive_test_utils.h"
|
| #include "chrome/test/base/testing_browser_process.h"
|
| #include "chrome/test/base/ui_test_utils.h"
|
| +#include "ui/aura/client/event_client.h"
|
| +#include "ui/aura/env.h"
|
| +#include "ui/aura/test/aura_test_helper.h"
|
| +#include "ui/aura/window_event_dispatcher.h"
|
| +#include "ui/aura/window_tree_host.h"
|
| #include "ui/base/ime/input_method_initializer.h"
|
| #include "ui/base/test/ui_controls.h"
|
| #include "ui/compositor/test/context_factories_for_test.h"
|
| +#include "ui/compositor/test/context_factories_for_test.h"
|
| #include "ui/message_center/message_center.h"
|
| #include "ui/views/view.h"
|
| #include "ui/views/widget/widget.h"
|
| +#include "ui/wm/core/wm_state.h"
|
|
|
| #if defined(USE_ASH)
|
| #include "ash/shell.h"
|
| @@ -25,16 +32,6 @@
|
| #include "ash/test/test_shell_delegate.h"
|
| #endif
|
|
|
| -#if defined(USE_AURA)
|
| -#include "ui/aura/client/event_client.h"
|
| -#include "ui/aura/env.h"
|
| -#include "ui/aura/test/aura_test_helper.h"
|
| -#include "ui/aura/window_event_dispatcher.h"
|
| -#include "ui/aura/window_tree_host.h"
|
| -#include "ui/compositor/test/context_factories_for_test.h"
|
| -#include "ui/wm/core/wm_state.h"
|
| -#endif
|
| -
|
| #if defined(OS_CHROMEOS)
|
| #include "chromeos/audio/cras_audio_handler.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| @@ -102,19 +99,15 @@ void ViewEventTestBase::SetUpTestCase() {
|
| }
|
|
|
| void ViewEventTestBase::SetUp() {
|
| -#if defined(USE_AURA)
|
| wm_state_.reset(new wm::WMState);
|
| -#endif
|
|
|
| views::ViewsDelegate::views_delegate = &views_delegate_;
|
| ui::InitializeInputMethodForTesting();
|
| gfx::NativeView context = NULL;
|
|
|
| -#if defined(USE_AURA)
|
| // The ContextFactory must exist before any Compositors are created.
|
| bool enable_pixel_output = false;
|
| ui::InitializeContextFactoryForTests(enable_pixel_output);
|
| -#endif
|
|
|
| #if defined(USE_ASH)
|
| #if defined(OS_WIN)
|
| @@ -179,16 +172,12 @@ void ViewEventTestBase::TearDown() {
|
| aura_test_helper_->TearDown();
|
| #endif // !USE_ASH && USE_AURA
|
|
|
| -#if defined(USE_AURA)
|
| ui::TerminateContextFactoryForTests();
|
| -#endif
|
|
|
| ui::ShutdownInputMethodForTesting();
|
| views::ViewsDelegate::views_delegate = NULL;
|
|
|
| -#if defined(USE_AURA)
|
| wm_state_.reset();
|
| -#endif
|
| }
|
|
|
| bool ViewEventTestBase::CanResize() const {
|
|
|