Revert 199625 "Remove ENABLE_MESSAGE_CENTER"

trunk/src/chrome/browser/browser_process_impl.cc

Index: trunk/src/chrome/browser/browser_process_impl.cc
===================================================================
--- trunk/src/chrome/browser/browser_process_impl.cc	(revision 199638)
+++ trunk/src/chrome/browser/browser_process_impl.cc	(working copy)
@@ -89,7 +89,6 @@
 #include "net/socket/client_socket_pool_manager.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/message_center/message_center.h"
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
 #include "chrome/browser/policy/browser_policy_connector.h"
@@ -97,6 +96,10 @@
 #include "chrome/browser/policy/policy_service_stub.h"
 #endif  // defined(ENABLE_CONFIGURATION_POLICY)
 
+#if defined(ENABLE_MESSAGE_CENTER)
+#include "ui/message_center/message_center.h"
+#endif
+
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "ui/views/focus/view_storage.h"
@@ -200,7 +203,9 @@
   extension_event_router_forwarder_ = new extensions::EventRouterForwarder;
   ExtensionRendererState::GetInstance()->Init();
 
+#if defined(ENABLE_MESSAGE_CENTER)
   message_center::MessageCenter::Initialize();
+#endif
 }
 
 BrowserProcessImpl::~BrowserProcessImpl() {
@@ -257,7 +262,9 @@
 
   ExtensionRendererState::GetInstance()->Shutdown();
 
+#if defined(ENABLE_MESSAGE_CENTER)
   message_center::MessageCenter::Shutdown();
+#endif
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
   // The policy providers managed by |browser_policy_connector_| need to shut
@@ -471,10 +478,12 @@
   return notification_ui_manager_.get();
 }
 
+#if defined(ENABLE_MESSAGE_CENTER)
 message_center::MessageCenter* BrowserProcessImpl::message_center() {
   DCHECK(CalledOnValidThread());
   return message_center::MessageCenter::Get();
 }
+#endif
 
 policy::BrowserPolicyConnector* BrowserProcessImpl::browser_policy_connector() {
   DCHECK(CalledOnValidThread());