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

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

Issue 15025002: Remove ENABLE_MESSAGE_CENTER (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing static initializer 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: chrome/browser/extensions/api/notifications/notifications_apitest.cc
diff --git a/chrome/browser/extensions/api/notifications/notifications_apitest.cc b/chrome/browser/extensions/api/notifications/notifications_apitest.cc
index a251db9ea2b03101fbef7f7f8a5b42fc05eebbb6..e84c10ab02cd8c89f177442377bd3472975cc9e2 100644
--- a/chrome/browser/extensions/api/notifications/notifications_apitest.cc
+++ b/chrome/browser/extensions/api/notifications/notifications_apitest.cc
@@ -274,12 +274,15 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestCSP) {
ASSERT_TRUE(RunExtensionTest("notifications/api/csp")) << message_;
}
-#ifdef ENABLE_MESSAGE_CENTER
-#if !defined(OS_WIN) || !defined(USE_ASH)
+// MessaceCenter-specific test.
+#if defined(RUN_MESSAGE_CENTER_TESTS)
+#define MAYBE_TestByUser TestByUser
+#else
+#define MAYBE_TestByUser DISABLED_TestByUser
+#endif
-IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestByUser) {
- if (!message_center::IsRichNotificationEnabled())
- return;
+IN_PROC_BROWSER_TEST_F(NotificationsApiTest, MAYBE_TestByUser) {
+ ASSERT_TRUE(message_center::IsRichNotificationEnabled());
const extensions::Extension* extension =
LoadExtensionAndWait("notifications/api/by_user");
@@ -301,6 +304,3 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestByUser) {
EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
}
}
-
-#endif
-#endif

Powered by Google App Engine
This is Rietveld 408576698