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

Unified Diff: chrome/browser/background/background_contents_service_unittest.cc

Issue 2555833002: Remove enable_notifications build flag and define (Closed)
Patch Set: Merge Created 4 years 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
« no previous file with comments | « chrome/browser/background/background_contents_service.cc ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/background/background_contents_service_unittest.cc
diff --git a/chrome/browser/background/background_contents_service_unittest.cc b/chrome/browser/background/background_contents_service_unittest.cc
index ee49d79efdd7eeeed22e28b4964805f1669b8d38..0c3db32ebb0d03ccc0542875898a937ae0671fb8 100644
--- a/chrome/browser/background/background_contents_service_unittest.cc
+++ b/chrome/browser/background/background_contents_service_unittest.cc
@@ -15,6 +15,8 @@
#include "chrome/browser/background/background_contents.h"
#include "chrome/browser/background/background_contents_service_factory.h"
#include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/notifications/message_center_notification_manager.h"
+#include "chrome/browser/notifications/notification.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/common/extensions/extension_test_util.h"
#include "chrome/common/pref_names.h"
@@ -30,15 +32,10 @@
#include "extensions/common/extension.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
-#include "url/gurl.h"
-
-#if defined(ENABLE_NOTIFICATIONS)
-#include "chrome/browser/notifications/message_center_notification_manager.h"
-#include "chrome/browser/notifications/notification.h"
#include "ui/message_center/fake_message_center_tray_delegate.h"
#include "ui/message_center/message_center.h"
#include "ui/message_center/message_center_observer.h"
-#endif
+#include "url/gurl.h"
class BackgroundContentsServiceTest : public testing::Test {
public:
@@ -126,7 +123,6 @@ class MockBackgroundContents : public BackgroundContents {
Profile* profile_;
};
-#if defined(ENABLE_NOTIFICATIONS)
// Wait for the notification created.
class NotificationWaiter : public message_center::MessageCenterObserver {
public:
@@ -226,7 +222,6 @@ class BackgroundContentsServiceNotificationTest
DISALLOW_COPY_AND_ASSIGN(BackgroundContentsServiceNotificationTest);
};
-#endif // ENABLE_NOTIFICATIONS
TEST_F(BackgroundContentsServiceTest, Create) {
// Check for creation and leaks.
@@ -360,7 +355,6 @@ TEST_F(BackgroundContentsServiceTest, TestApplicationIDLinkage) {
EXPECT_EQ(url2.spec(), GetPrefURLForApp(&profile, contents2->appid()));
}
-#if defined(ENABLE_NOTIFICATIONS)
TEST_F(BackgroundContentsServiceNotificationTest, TestShowBalloon) {
scoped_refptr<extensions::Extension> extension =
extension_test_util::LoadManifest("image_loading_tracker", "app.json");
@@ -420,4 +414,3 @@ TEST_F(BackgroundContentsServiceNotificationTest, TestShowTwoBalloons) {
message_center->GetVisibleNotifications();
ASSERT_EQ(1u, notifications.size());
}
-#endif
« no previous file with comments | « chrome/browser/background/background_contents_service.cc ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698