Revert of Minimize the delegate dependencies for non persistent notifications.

chrome/browser/notifications/platform_notification_service_interactive_uitest.cc

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 5a9a85e49acbd5d57462601f19c6b74ed6c33221..dae163b3b44ad133d99abe80ca53b944d4a848bf 100644
--- a/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
+++ b/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
@@ -68,8 +68,7 @@
   ~PlatformNotificationServiceBrowserTest() override {}
 
   // InProcessBrowserTest overrides.
-  void SetUpDefaultCommandLine(base::CommandLine* command_line) override;
-
+  void SetUpCommandLine(base::CommandLine* command_line) override;
   void SetUp() override;
   void SetUpOnMainThread() override;
   void TearDown() override;
@@ -137,19 +136,11 @@
       // filesystem.
       test_page_url_(std::string("/") + kTestFileName) {}
 
-void PlatformNotificationServiceBrowserTest::SetUpDefaultCommandLine(
+void PlatformNotificationServiceBrowserTest::SetUpCommandLine(
     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)
+  InProcessBrowserTest::SetUpCommandLine(command_line);
 }
 
 void PlatformNotificationServiceBrowserTest::SetUp() {
@@ -833,14 +824,8 @@
  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)
+    scoped_feature_list_.InitAndDisableFeature(
+        features::kNotificationContentImage);
     InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
   }