Revert of Minimize the delegate dependencies for non persistent notifications.

chrome/browser/notifications/notification_interactive_uitest_support.cc

Index: chrome/browser/notifications/notification_interactive_uitest_support.cc
diff --git a/chrome/browser/notifications/notification_interactive_uitest_support.cc b/chrome/browser/notifications/notification_interactive_uitest_support.cc
index 36bd4050fd35ba64b6116bf3a75526c4e9e656b9..21467c6b3d2550fa858fd4977901bd93fdad9beb 100644
--- a/chrome/browser/notifications/notification_interactive_uitest_support.cc
+++ b/chrome/browser/notifications/notification_interactive_uitest_support.cc
@@ -122,10 +122,10 @@
   InProcessBrowserTest::SetUpDefaultCommandLine(command_line);
 // Temporary change while the whole support class is changed to deal
 // with native notifications. crbug.com/714679
-#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
+#if defined(OS_MACOSX)
   command_line->AppendSwitchASCII(switches::kDisableFeatures,
                                   features::kNativeNotifications.name);
-#endif  // BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
+#endif
 }
 
 int NotificationsTest::GetNotificationCount() {
@@ -294,30 +294,16 @@
 }
 
 void NotificationsTest::EnableFullscreenNotifications() {
-#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
-  feature_list_.InitWithFeatures(
-      {features::kPreferHtmlOverPlugins,
-       features::kAllowFullscreenWebNotificationsFeature},
-      {features::kNativeNotifications});
-#else
   feature_list_.InitWithFeatures(
       {features::kPreferHtmlOverPlugins,
        features::kAllowFullscreenWebNotificationsFeature},
       {});
-#endif  //  BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
 }
 
 void NotificationsTest::DisableFullscreenNotifications() {
-#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
-  feature_list_.InitWithFeatures(
-      {features::kPreferHtmlOverPlugins},
-      {features::kAllowFullscreenWebNotificationsFeature,
-       features::kNativeNotifications});
-#else
   feature_list_.InitWithFeatures(
       {features::kPreferHtmlOverPlugins},
       {features::kAllowFullscreenWebNotificationsFeature});
-#endif  // BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
 }
 
 void NotificationsTest::DropOriginPreference(const GURL& origin) {