Revert of Minimize the delegate dependencies for non persistent notifications.

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 50 matching lines @@
 
 const int kNotificationVibrationPattern[] = { 100, 200, 300 };
 const double kNotificationTimestamp = 621046800000.;
 
 class PlatformNotificationServiceBrowserTest : public InProcessBrowserTest {
  public:
   PlatformNotificationServiceBrowserTest();
   ~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;
 
  protected:
   // Returns the Platform Notification Service these unit tests are for.
   PlatformNotificationServiceImpl* service() const {
     return PlatformNotificationServiceImpl::GetInstance();
   }
 
@@ skipping 47 matching lines @@
 namespace {
 const char kTestFileName[] = "notifications/platform_notification_service.html";
 }
 
 PlatformNotificationServiceBrowserTest::PlatformNotificationServiceBrowserTest()
     : server_root_(FILE_PATH_LITERAL("chrome/test/data")),
       // The test server has a base directory that doesn't exist in the
       // 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() {
   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());
   InProcessBrowserTest::SetUp();
 }
@@ skipping 663 matching lines @@
   const Notification& notification = ui_manager()->GetNotificationAt(0);
   EXPECT_FALSE(notification.delegate()->ShouldDisplayOverFullscreen());
 }
 #endif
 
 class PlatformNotificationServiceWithoutContentImageBrowserTest
     : public PlatformNotificationServiceBrowserTest {
  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();
   }
 
  private:
   base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_F(
     PlatformNotificationServiceWithoutContentImageBrowserTest,
     KillSwitch) {
   ASSERT_NO_FATAL_FAILURE(GrantNotificationPermissionForTest());
 
   std::string script_result;
   ASSERT_TRUE(
       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());
 }