Revert 199625 "Remove ENABLE_MESSAGE_CENTER"

trunk/src/ash/shell/content_client/shell_browser_main_parts.cc

Index: trunk/src/ash/shell/content_client/shell_browser_main_parts.cc
===================================================================
--- trunk/src/ash/shell/content_client/shell_browser_main_parts.cc	(revision 199638)
+++ trunk/src/ash/shell/content_client/shell_browser_main_parts.cc	(working copy)
@@ -28,10 +28,13 @@
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/test/compositor_test_support.h"
 #include "ui/gfx/screen.h"
-#include "ui/message_center/message_center.h"
 #include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/test/test_views_delegate.h"
 
+#if defined(ENABLE_MESSAGE_CENTER)
+#include "ui/message_center/message_center.h"
+#endif
+
 #if defined(USE_X11)
 #include "ui/base/touch/touch_factory_x11.h"
 #endif
@@ -106,9 +109,11 @@
     views::ViewsDelegate::views_delegate = new ShellViewsDelegate;
 
   delegate_ = new ash::shell::ShellDelegateImpl;
+#if defined(ENABLE_MESSAGE_CENTER)
   // The global message center state must be initialized absent
   // g_browser_process.
   message_center::MessageCenter::Initialize();
+#endif
   ash::Shell::CreateInstance(delegate_);
   ash::Shell::GetInstance()->set_browser_context(browser_context_.get());
 
@@ -137,9 +142,11 @@
   delegate_->SetWatcher(NULL);
   delegate_ = NULL;
   ash::Shell::DeleteInstance();
+#if defined(ENABLE_MESSAGE_CENTER)
   // The global message center state must be shutdown absent
   // g_browser_process.
   message_center::MessageCenter::Shutdown();
+#endif
   aura::Env::DeleteInstance();
 
   // The keyboard may have created a WebContents. The WebContents is destroyed