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

Unified Diff: chrome/browser/notifications/platform_notification_service_interactive_uitest.cc

Issue 2910843002: [Cleanup] Move all browsertests to use ScopedFeatureList to modify features
Patch Set: Ilya comments addressed Created 3 years, 6 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/platform_notification_service_interactive_uitest.cc
diff --git a/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc b/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
index 0b6f6cd0b0b528fc1a136723afa7fb8c25707015..4336fd28ec0feb813d41d74153d50bff49b816bb 100644
--- a/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
+++ b/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
@@ -144,13 +144,6 @@ void PlatformNotificationServiceBrowserTest::SetUpDefaultCommandLine(
// Needed for the Reply button tests
command_line->AppendSwitch(switches::kEnableExperimentalWebPlatformFeatures);
-
-#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
- // TODO(crbug.com/714679): Temporary change while tests are upgraded to deal
- // with native notifications.
- command_line->AppendSwitchASCII(switches::kDisableFeatures,
- features::kNativeNotifications.name);
-#endif // BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
}
void PlatformNotificationServiceBrowserTest::SetUp() {
@@ -159,6 +152,11 @@ void PlatformNotificationServiceBrowserTest::SetUp() {
new net::EmbeddedTestServer(net::EmbeddedTestServer::TYPE_HTTPS));
https_server_->ServeFilesFromSourceDirectory(server_root_);
ASSERT_TRUE(https_server_->Start());
+#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
+ // TODO(crbug.com/714679): Temporary change while tests are upgraded to deal
+ // with native notifications.
+ feature_list_.InitAndDisableFeature(features::kNativeNotifications);
+#endif // BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
InProcessBrowserTest::SetUp();
}
@@ -828,17 +826,10 @@ IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
class PlatformNotificationServiceWithoutContentImageBrowserTest
: public PlatformNotificationServiceBrowserTest {
public:
- // InProcessBrowserTest overrides.
- void SetUpInProcessBrowserTestFixture() override {
-#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
- scoped_feature_list_.InitWithFeatures(
- {},
- {features::kNotificationContentImage, features::kNativeNotifications});
-#else
- scoped_feature_list_.InitWithFeatures(
- {}, {features::kNotificationContentImage});
-#endif // BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
- InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
+ void SetUp() override {
+ scoped_feature_list_.InitAndDisableFeature(
+ features::kNotificationContentImage);
+ PlatformNotificationServiceBrowserTest::SetUp();
}
private:

Powered by Google App Engine
This is Rietveld 408576698