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

Unified Diff: chrome/browser/task_manager/task_manager_notification_browsertest.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/task_manager/task_manager_notification_browsertest.cc
diff --git a/chrome/browser/task_manager/task_manager_notification_browsertest.cc b/chrome/browser/task_manager/task_manager_notification_browsertest.cc
index 73f96571e4ec6cf4d1f7c8e9949a0a95f2cd2750..eb516934b9c3638f89b2a017c18b4045be912d76 100644
--- a/chrome/browser/task_manager/task_manager_notification_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_notification_browsertest.cc
@@ -19,10 +19,7 @@
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/common/content_switches.h"
#include "testing/gtest/include/gtest/gtest.h"
-
-#if !defined(ENABLE_MESSAGE_CENTER)
-// These tests do not apply with Message Center platforms
-// where notifications do not instantiate a new renderer.
+#include "ui/message_center/message_center_util.h"
class TaskManagerNotificationBrowserTest : public ExtensionBrowserTest {
public:
@@ -48,6 +45,11 @@ class TaskManagerNotificationBrowserTest : public ExtensionBrowserTest {
#endif
IN_PROC_BROWSER_TEST_F(TaskManagerNotificationBrowserTest,
MAYBE_NoticeNotificationChanges) {
+ // These tests do not apply with Message Center platforms
+ // where notifications do not instantiate a new renderer.
+ if (message_center::IsRichNotificationEnabled())
+ return;
+
EXPECT_EQ(0, model()->ResourceCount());
// Show the task manager.
@@ -79,5 +81,3 @@ IN_PROC_BROWSER_TEST_F(TaskManagerNotificationBrowserTest,
notifications->CancelById(n2.notification_id());
TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
}
-
-#endif // !ENABLE_MESSAGE_CENTER
« no previous file with comments | « chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698