Revert 199625 "Remove ENABLE_MESSAGE_CENTER"

trunk/src/chrome/test/base/view_event_test_base.cc

Index: trunk/src/chrome/test/base/view_event_test_base.cc
===================================================================
--- trunk/src/chrome/test/base/view_event_test_base.cc	(revision 199638)
+++ trunk/src/chrome/test/base/view_event_test_base.cc	(working copy)
@@ -14,11 +14,14 @@
 #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"
@@ -109,9 +112,11 @@
   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
@@ -149,9 +154,11 @@
 #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)