Revert 199625 "Remove ENABLE_MESSAGE_CENTER"

trunk/src/chrome/browser/extensions/api/notifications/notifications_apitest.cc

Index: trunk/src/chrome/browser/extensions/api/notifications/notifications_apitest.cc
===================================================================
--- trunk/src/chrome/browser/extensions/api/notifications/notifications_apitest.cc	(revision 199638)
+++ trunk/src/chrome/browser/extensions/api/notifications/notifications_apitest.cc	(working copy)
@@ -274,15 +274,12 @@
   ASSERT_TRUE(RunExtensionTest("notifications/api/csp")) << message_;
 }
 
-// MessaceCenter-specific test.
-#if defined(RUN_MESSAGE_CENTER_TESTS)
-#define MAYBE_TestByUser TestByUser
-#else
-#define MAYBE_TestByUser DISABLED_TestByUser
-#endif
+#ifdef ENABLE_MESSAGE_CENTER
+#if !defined(OS_WIN) || !defined(USE_ASH)
 
-IN_PROC_BROWSER_TEST_F(NotificationsApiTest, MAYBE_TestByUser) {
-  ASSERT_TRUE(message_center::IsRichNotificationEnabled());
+IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestByUser) {
+  if (!message_center::IsRichNotificationEnabled())
+    return;
 
   const extensions::Extension* extension =
       LoadExtensionAndWait("notifications/api/by_user");
@@ -304,3 +301,6 @@
     EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   }
 }
+
+#endif
+#endif