[Cleanup] Move all browsertests to use ScopedFeatureList to modify features

chrome/browser/notifications/platform_notification_service_interactive_uitest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 70 matching lines @@
     return PlatformNotificationServiceImpl::GetInstance();
   }
 
   // Grants permission to display Web Notifications for origin of the test
   // page that's being used in this browser test.
   void GrantNotificationPermissionForTest() const;
 
   bool RequestAndAcceptPermission();
   bool RequestAndDenyPermission();
 
-  void EnableFullscreenNotifications();
-  void DisableFullscreenNotifications();
+  void EnableFullscreenNotifications(
+      base::test::ScopedFeatureList* scoped_feature_list);
+  void DisableFullscreenNotifications(
+      base::test::ScopedFeatureList* scoped_feature_list);
 
   double GetEngagementScore(const GURL& origin) const;
   GURL GetLastCommittedURL() const;
 
   // Returns the UI Manager on which notifications will be displayed.
   StubNotificationUIManager* ui_manager() const { return ui_manager_.get(); }
 
   const base::FilePath& server_root() const { return server_root_; }
 
   // Navigates the browser to the test page indicated by |path|.
@@ skipping 34 matching lines @@
       // The test server has a base directory that doesn't exist in the
       // filesystem.
       test_page_url_(std::string("/") + kTestFileName) {}
 
 void PlatformNotificationServiceBrowserTest::SetUpDefaultCommandLine(
     base::CommandLine* command_line) {
   InProcessBrowserTest::SetUpDefaultCommandLine(command_line);
 
   // 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() {
   ui_manager_.reset(new StubNotificationUIManager);
   https_server_.reset(
       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();
 }
 
 void PlatformNotificationServiceBrowserTest::SetUpOnMainThread() {
   SiteEngagementScore::SetParamValuesForTesting();
   engagement_service_ = SiteEngagementService::Get(browser()->profile());
   NavigateToTestPage(test_page_url_);
   display_service_.reset(
       new MessageCenterDisplayService(browser()->profile(), ui_manager_.get()));
   service()->SetNotificationDisplayServiceForTesting(display_service_.get());
@@ skipping 53 matching lines @@
       RequestAndRespondToPermission(PermissionRequestManager::ACCEPT_ALL);
   return "granted" == result;
 }
 
 bool PlatformNotificationServiceBrowserTest::RequestAndDenyPermission() {
   std::string result =
       RequestAndRespondToPermission(PermissionRequestManager::DENY_ALL);
   return "denied" == result;
 }
 
-void PlatformNotificationServiceBrowserTest::EnableFullscreenNotifications() {
-  feature_list_.InitWithFeatures({
-    features::kPreferHtmlOverPlugins,
-    features::kAllowFullscreenWebNotificationsFeature}, {});
+void PlatformNotificationServiceBrowserTest::EnableFullscreenNotifications(
+    base::test::ScopedFeatureList* scoped_feature_list) {
+  scoped_feature_list->InitWithFeatures(
+      {features::kPreferHtmlOverPlugins,
+       features::kAllowFullscreenWebNotificationsFeature},
+      {});
 }
 
-void PlatformNotificationServiceBrowserTest::DisableFullscreenNotifications() {
-  feature_list_.InitWithFeatures(
+void PlatformNotificationServiceBrowserTest::DisableFullscreenNotifications(
+    base::test::ScopedFeatureList* scoped_feature_list) {
+  scoped_feature_list->InitWithFeatures(
       {features::kPreferHtmlOverPlugins},
       {features::kAllowFullscreenWebNotificationsFeature});
 }
 
 double PlatformNotificationServiceBrowserTest::GetEngagementScore(
     const GURL& origin) const {
   return engagement_service_->GetScore(origin);
 }
 
 GURL PlatformNotificationServiceBrowserTest::GetLastCommittedURL() const {
@@ skipping 440 matching lines @@
 
   ASSERT_TRUE(RunScript("GetMessageFromWorker()", &script_message));
   notifications = base::SplitString(script_message, ",", base::KEEP_WHITESPACE,
                                     base::SPLIT_WANT_ALL);
   ASSERT_EQ(1u, notifications.size());
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
                        TestShouldDisplayNormal) {
   ASSERT_NO_FATAL_FAILURE(GrantNotificationPermissionForTest());
-  EnableFullscreenNotifications();
+  base::test::ScopedFeatureList scoped_feature_list;
+  EnableFullscreenNotifications(&scoped_feature_list);
 
   std::string script_result;
   ASSERT_TRUE(RunScript(
       "DisplayPersistentNotification('display_normal')", &script_result));
   EXPECT_EQ("ok", script_result);
 
   ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
   const Notification& notification = ui_manager()->GetNotificationAt(0);
   EXPECT_FALSE(notification.delegate()->ShouldDisplayOverFullscreen());
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
                        TestShouldDisplayFullscreen) {
 #if defined(OS_MACOSX)
   ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen;
 #endif
   ASSERT_NO_FATAL_FAILURE(GrantNotificationPermissionForTest());
-  EnableFullscreenNotifications();
+  base::test::ScopedFeatureList scoped_feature_list;
+  EnableFullscreenNotifications(&scoped_feature_list);
 
   std::string script_result;
   ASSERT_TRUE(RunScript(
       "DisplayPersistentNotification('display_normal')", &script_result));
   EXPECT_EQ("ok", script_result);
 
   // Set the page fullscreen
   browser()->exclusive_access_manager()->fullscreen_controller()->
       ToggleBrowserFullscreenMode();
 
@@ skipping 12 matching lines @@
   const Notification& notification = ui_manager()->GetNotificationAt(0);
   EXPECT_TRUE(notification.delegate()->ShouldDisplayOverFullscreen());
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
                        TestShouldDisplayFullscreenOff) {
 #if defined(OS_MACOSX)
   ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen;
 #endif
   ASSERT_NO_FATAL_FAILURE(GrantNotificationPermissionForTest());
-  DisableFullscreenNotifications();
+  base::test::ScopedFeatureList scoped_feature_list;
+  DisableFullscreenNotifications(&scoped_feature_list);
 
   std::string script_result;
   ASSERT_TRUE(RunScript(
       "DisplayPersistentNotification('display_normal')", &script_result));
   EXPECT_EQ("ok", script_result);
 
   // Set the page fullscreen
   browser()->exclusive_access_manager()->fullscreen_controller()->
       ToggleBrowserFullscreenMode();
 
@@ skipping 14 matching lines @@
   // return false.
   EXPECT_FALSE(notification.delegate()->ShouldDisplayOverFullscreen());
 }
 
 // The Fake OSX fullscreen window doesn't like drawing a second fullscreen
 // window when another is visible.
 #if !defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
                        TestShouldDisplayMultiFullscreen) {
   ASSERT_NO_FATAL_FAILURE(GrantNotificationPermissionForTest());
-  EnableFullscreenNotifications();
+  base::test::ScopedFeatureList scoped_feature_list;
+  EnableFullscreenNotifications(&scoped_feature_list);
 
   Browser* other_browser = CreateBrowser(browser()->profile());
   ui_test_utils::NavigateToURL(other_browser, GURL("about:blank"));
 
   std::string script_result;
   ASSERT_TRUE(RunScript(
       "DisplayPersistentNotification('display_normal')", &script_result));
   EXPECT_EQ("ok", script_result);
 
   // Set the notifcation page fullscreen
@@ skipping 54 matching lines @@
       RunScript("DisplayPersistentAllOptionsNotification()", &script_result));
   EXPECT_EQ("ok", script_result);
 
   ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
   const Notification& notification = ui_manager()->GetNotificationAt(0);
 
   // Since the kNotificationContentImage kill switch has disabled images, the
   // notification should be shown without an image.
   EXPECT_TRUE(notification.image().IsEmpty());
 }