Pass Notification into NotificationBlocker ShouldShow* methods

ui/message_center/message_center_impl_unittest.cc

 // Copyright 2013 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 "ui/message_center/message_center_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 136 matching lines @@
 
   void SetNotificationsEnabled(bool enabled) {
     if (notifications_enabled_ != enabled) {
       notifications_enabled_ = enabled;
       NotifyBlockingStateChanged();
     }
   }
 
   // NotificationBlocker overrides:
   bool ShouldShowNotificationAsPopup(
-      const message_center::NotifierId& notifier_id) const override {
+      const message_center::Notification& notification) const override {
     return notifications_enabled_;
   }
 
  private:
   bool notifications_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(ToggledNotificationBlocker);
 };
 
 class PopupNotificationBlocker : public ToggledNotificationBlocker {
  public:
   PopupNotificationBlocker(MessageCenter* message_center,
                            const NotifierId& allowed_notifier)
       : ToggledNotificationBlocker(message_center),
         allowed_notifier_(allowed_notifier) {}
   ~PopupNotificationBlocker() override {}
 
   // NotificationBlocker overrides:
   bool ShouldShowNotificationAsPopup(
-      const NotifierId& notifier_id) const override {
-    return (notifier_id == allowed_notifier_) ||
-        ToggledNotificationBlocker::ShouldShowNotificationAsPopup(notifier_id);
+      const Notification& notification) const override {
+    return (notification.notifier_id() == allowed_notifier_) ||
+        ToggledNotificationBlocker::ShouldShowNotificationAsPopup(
+            notification);
   }
 
  private:
   NotifierId allowed_notifier_;
 
   DISALLOW_COPY_AND_ASSIGN(PopupNotificationBlocker);
 };
 
 class TotalNotificationBlocker : public PopupNotificationBlocker {
  public:
   TotalNotificationBlocker(MessageCenter* message_center,
                            const NotifierId& allowed_notifier)
       : PopupNotificationBlocker(message_center, allowed_notifier) {}
   ~TotalNotificationBlocker() override {}
 
   // NotificationBlocker overrides:
-  bool ShouldShowNotification(const NotifierId& notifier_id) const override {
-    return ShouldShowNotificationAsPopup(notifier_id);
+  bool ShouldShowNotification(const Notification& notification) const override {
+    return ShouldShowNotificationAsPopup(notification);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TotalNotificationBlocker);
 };
 
 bool PopupNotificationsContain(
     const NotificationList::PopupNotifications& popups,
     const std::string& id) {
   for (NotificationList::PopupNotifications::const_iterator iter =
@@ skipping 960 matching lines @@
   // Then open the message center.
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
 
   // Then update a notification; the update should have propagated.
   message_center()->RemoveNotification(id, false);
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(id));
 }
 
 }  // namespace internal
 }  // namespace message_center