Minimize the delegate dependencies for non persistent notifications.

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 104 matching lines @@
   return impl_->Wait();
 }
 
 // -----------------------------------------------------------------------------
 
 void NotificationsTest::SetUpDefaultCommandLine(
     base::CommandLine* command_line) {
   InProcessBrowserTest::SetUpDefaultCommandLine(command_line);
 // Temporary change while the whole support class is changed to deal
 // with native notifications. crbug.com/714679
-#if defined(OS_MACOSX)
+#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
   command_line->AppendSwitchASCII(switches::kDisableFeatures,
                                   features::kNativeNotifications.name);
-#endif
+#endif  // BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
 }
 
 int NotificationsTest::GetNotificationCount() {
   return message_center::MessageCenter::Get()->NotificationCount();
 }
 
 int NotificationsTest::GetNotificationPopupCount() {
   return message_center::MessageCenter::Get()->GetPopupNotifications().size();
 }
 
@@ skipping 148 matching lines @@
 GURL NotificationsTest::GetTestPageURL() const {
   return GetTestPageURLForFile("notification_tester.html");
 }
 
 content::WebContents* NotificationsTest::GetActiveWebContents(
     Browser* browser) {
   return browser->tab_strip_model()->GetActiveWebContents();
 }
 
 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) {
   DesktopNotificationProfileUtil::ClearSetting(browser()->profile(), origin);
 }