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

Unified Diff: chrome/browser/notifications/sync_notifier/synced_notification_unittest.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/notifications/sync_notifier/synced_notification_unittest.cc
diff --git a/chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc b/chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc
index 3ccd4c2cd63d030e641c7d0a3d6e44c52a0f6a1c..87810cce0928a9891f699ae57639b31deae620f2 100644
--- a/chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc
+++ b/chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc
@@ -13,10 +13,8 @@
#include "sync/protocol/sync.pb.h"
#include "sync/protocol/synced_notification_specifics.pb.h"
#include "testing/gtest/include/gtest/gtest.h"
-#if defined(ENABLE_MESSAGE_CENTER)
#include "ui/message_center/message_center_util.h"
#include "ui/message_center/notification_types.h"
-#endif // ENABLE_MESSAGE_CENTER
using syncer::SyncData;
using notifier::SyncedNotification;
@@ -28,19 +26,11 @@ namespace {
const uint64 kFakeCreationTime = 42;
const int kProtobufPriority = static_cast<int>(
sync_pb::CoalescedSyncedNotification_Priority_LOW);
-#if defined (ENABLE_MESSAGE_CENTER)
const int kNotificationPriority = static_cast<int>(
message_center::LOW_PRIORITY);
-#else // ENABLE_MESSAGE_CENTER
-const int kNotificationPriority = 1;
-#endif // ENABLE_MESSAGE_CENTER
bool UseRichNotifications() {
-#if defined(ENABLE_MESSAGE_CENTER)
return message_center::IsRichNotificationEnabled();
-#else // ENABLE_MESSAGE_CENTER
- return false;
-#endif // ENABLE_MESSAGE_CENTER
}
const char kTitle1[] = "New appointment at 2:15";
@@ -572,8 +562,6 @@ TEST_F(SyncedNotificationTest, ShowTest) {
if (!UseRichNotifications())
return;
-#if defined(ENABLE_MESSAGE_CENTER)
-
StubNotificationUIManager notification_manager;
// Call the method under test using the pre-populated data.
@@ -635,8 +623,6 @@ TEST_F(SyncedNotificationTest, ShowTest) {
<< "Expected: " << expected_fields
<< ", but actual: " << *actual_fields;
-#endif // ENABLE_MESSAGE_CENTER
-
}
// TODO(petewil): Add a test for a notification being read and or deleted.

Powered by Google App Engine
This is Rietveld 408576698