trunk/src/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc - Issue 14631021: Revert 199625 "Remove ENABLE_MESSAGE_CENTER"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.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:

Index: trunk/src/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc

===================================================================

--- trunk/src/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc (revision 199638)

+++ trunk/src/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc (working copy)

@@ -18,7 +18,6 @@

#include "sync/protocol/sync.pb.h"

#include "sync/protocol/synced_notification_specifics.pb.h"

#include "testing/gtest/include/gtest/gtest.h"

-#include "ui/message_center/message_center_util.h"

using sync_pb::SyncedNotificationSpecifics;

using sync_pb::EntitySpecifics;

@@ -95,8 +94,12 @@

const int64 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

const sync_pb::CoalescedSyncedNotification_ReadState kDismissed =

sync_pb::CoalescedSyncedNotification_ReadState_DISMISSED;

const sync_pb::CoalescedSyncedNotification_ReadState kUnread =