| 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 240f63fb098183ab7756b7b04175660902c9fbda..2f6bc0163fc9ba0a9a3db198928ec3dbe5fcb404 100644
|
| --- a/chrome/test/base/view_event_test_base.cc
|
| +++ b/chrome/test/base/view_event_test_base.cc
|
| @@ -14,14 +14,11 @@
|
| #include "content/public/browser/browser_thread.h"
|
| #include "ui/base/ime/text_input_test_support.h"
|
| #include "ui/compositor/test/compositor_test_support.h"
|
| +#include "ui/message_center/message_center.h"
|
| #include "ui/views/view.h"
|
| #include "ui/views/widget/desktop_aura/desktop_screen.h"
|
| #include "ui/views/widget/widget.h"
|
|
|
| -#if defined(ENABLE_MESSAGE_CENTER)
|
| -#include "ui/message_center/message_center.h"
|
| -#endif
|
| -
|
| #if defined(USE_ASH)
|
| #include "ash/shell.h"
|
| #include "ash/test/test_shell_delegate.h"
|
| @@ -111,11 +108,9 @@ void ViewEventTestBase::SetUp() {
|
| gfx::Screen::SetScreenInstance(
|
| gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());
|
| #else
|
| -#if defined(ENABLE_MESSAGE_CENTER)
|
| // Ash Shell can't just live on its own without a browser process, we need to
|
| // also create the message center.
|
| message_center::MessageCenter::Initialize();
|
| -#endif
|
| #if defined(OS_CHROMEOS)
|
| chromeos::CrasAudioHandler::InitializeForTesting();
|
| #endif
|
| @@ -153,11 +148,9 @@ void ViewEventTestBase::TearDown() {
|
| #if defined(OS_CHROMEOS)
|
| chromeos::CrasAudioHandler::Shutdown();
|
| #endif
|
| -#if defined(ENABLE_MESSAGE_CENTER)
|
| // Ash Shell can't just live on its own without a browser process, we need to
|
| // also shut down the message center.
|
| message_center::MessageCenter::Shutdown();
|
| -#endif
|
| aura::Env::DeleteInstance();
|
| #endif
|
| #elif defined(USE_AURA)
|
|
|