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

chrome/browser/notifications/notification_interactive_uitest_support.cc

 // Copyright 2017 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 "chrome/browser/notifications/notification_interactive_uitest_support.h"
 
 #include "base/run_loop.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/notifications/desktop_notification_profile_util.h"
@@ skipping 100 matching lines @@
 
 MessageCenterChangeObserver::MessageCenterChangeObserver() : impl_(new Impl) {}
 MessageCenterChangeObserver::~MessageCenterChangeObserver() = default;
 
 bool MessageCenterChangeObserver::Wait() {
   return impl_->Wait();
 }
 
 // -----------------------------------------------------------------------------
 
-void NotificationsTest::SetUpDefaultCommandLine(
-    base::CommandLine* command_line) {
-  InProcessBrowserTest::SetUpDefaultCommandLine(command_line);
+NotificationsTest::NotificationsTest() {
 // Temporary change while the whole support class is changed to deal
 // with native notifications. crbug.com/714679
 #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
   feature_list_.InitAndDisableFeature(features::kNativeNotifications);
 #endif  // BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
 }
 
 int NotificationsTest::GetNotificationCount() {
   return message_center::MessageCenter::Get()->NotificationCount();
 }
@@ skipping 164 matching lines @@
   return GetTestPageURLForFile("notification_tester.html");
 }
 
 content::WebContents* NotificationsTest::GetActiveWebContents(
     Browser* browser) {
   return browser->tab_strip_model()->GetActiveWebContents();
 }
 
 void NotificationsTest::EnablePermissionsEmbargo(
     base::test::ScopedFeatureList* scoped_feature_list) {
-#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
-  scoped_feature_list->InitWithFeatures(
-      {features::kBlockPromptsIfDismissedOften,
-       features::kBlockPromptsIfIgnoredOften},
-      {features::kNativeNotifications});
-#else
   scoped_feature_list->InitWithFeatures(
       {features::kBlockPromptsIfDismissedOften,
        features::kBlockPromptsIfIgnoredOften},
       {});
-#endif  //  BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
 }
 
 void NotificationsTest::EnableFullscreenNotifications(
     base::test::ScopedFeatureList* scoped_feature_list) {
-#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
-  scoped_feature_list->InitWithFeatures(
-      {features::kPreferHtmlOverPlugins,
-       features::kAllowFullscreenWebNotificationsFeature},
-      {features::kNativeNotifications});
-#else
   scoped_feature_list->InitWithFeatures(
       {features::kPreferHtmlOverPlugins,
        features::kAllowFullscreenWebNotificationsFeature},
       {});
-#endif  //  BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
 }
 
 void NotificationsTest::DisableFullscreenNotifications(
     base::test::ScopedFeatureList* scoped_feature_list) {
-#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
-  scoped_feature_list->InitWithFeatures(
-      {features::kPreferHtmlOverPlugins},
-      {features::kAllowFullscreenWebNotificationsFeature,
-       features::kNativeNotifications});
-#else
   scoped_feature_list->InitWithFeatures(
       {features::kPreferHtmlOverPlugins},
       {features::kAllowFullscreenWebNotificationsFeature});
-#endif  // BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
 }
 
 void NotificationsTest::DropOriginPreference(const GURL& origin) {
   DesktopNotificationProfileUtil::ClearSetting(browser()->profile(), origin);
 }