Revert of Minimize the delegate dependencies for non persistent notifications.

chrome/browser/notifications/platform_notification_service_unittest.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 <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/feature_list.h"
@@ skipping 47 matching lines @@
 using content::PlatformNotificationData;
 
 namespace {
 
 const char kNotificationId[] = "my-notification-id";
 const int kNotificationVibrationPattern[] = { 100, 200, 300 };
 
 class MockDesktopNotificationDelegate
     : public content::DesktopNotificationDelegate {
  public:
-  MockDesktopNotificationDelegate() : displayed_(false) {}
+  MockDesktopNotificationDelegate()
+      : displayed_(false),
+        clicked_(false) {}
 
   ~MockDesktopNotificationDelegate() override {}
 
   // content::DesktopNotificationDelegate implementation.
   void NotificationDisplayed() override { displayed_ = true; }
   void NotificationClosed() override {}
-  void NotificationClick() override {}
+  void NotificationClick() override { clicked_ = true; }
 
   bool displayed() const { return displayed_; }
+  bool clicked() const { return clicked_; }
 
  private:
   bool displayed_;
+  bool clicked_;
 
   DISALLOW_COPY_AND_ASSIGN(MockDesktopNotificationDelegate);
 };
 
 }  // namespace
 
 class PlatformNotificationServiceTest : public testing::Test {
  public:
   void SetUp() override {
     profile_manager_ = base::MakeUnique<TestingProfileManager>(
@@ skipping 91 matching lines @@
   NotificationDisplayService* display_service() const {
     return NotificationDisplayServiceFactory::GetForProfile(profile_);
   }
 
   std::unique_ptr<TestingProfileManager> profile_manager_;
   TestingProfile* profile_;
   content::TestBrowserThreadBundle thread_bundle_;
   std::unique_ptr<std::set<std::string>> displayed_notifications_;
 };
 
-// Native, non persistent notifications don't have delegates any more
-#if !defined(OS_MACOSX)
 TEST_F(PlatformNotificationServiceTest, DisplayPageDisplayedEvent) {
   auto* delegate = CreateSimplePageNotification();
 
   EXPECT_EQ(1u, GetNotificationCount());
   EXPECT_TRUE(delegate->displayed());
 }
-#endif  // !defined(OS_MACOSX)
 
 TEST_F(PlatformNotificationServiceTest, DisplayPageCloseClosure) {
   base::Closure close_closure;
   CreateSimplePageNotificationWithCloseClosure(&close_closure);
 
   EXPECT_EQ(1u, GetNotificationCount());
 
   ASSERT_FALSE(close_closure.is_null());
   close_closure.Run();
 
@@ skipping 221 matching lines @@
       profile(),
       GURL() /* service_worker_scope */,
       GURL("chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"),
       notification_data, NotificationResources(),
       new MockNotificationDelegate("hello"));
   EXPECT_EQ("NotificationTest",
             base::UTF16ToUTF8(notification.context_message()));
 }
 
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS)