Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Unified Diff: trunk/src/chrome/browser/extensions/api/notifications/notifications_apitest.cc

Issue 14631021: Revert 199625 "Remove ENABLE_MESSAGE_CENTER" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698