Pass Notification into NotificationBlocker ShouldShow* methods

chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_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 "ash/common/system/system_notifier.h"
 #include "ash/common/wm_shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/macros.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/fake_user_manager.h"
 #include "components/user_manager/user_info.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 
+using base::UTF8ToUTF16;
+
 class MultiUserNotificationBlockerChromeOSTest
     : public ash::test::AshTestBase,
       public message_center::NotificationBlocker::Observer {
  public:
   MultiUserNotificationBlockerChromeOSTest()
       : state_changed_count_(0),
         testing_profile_manager_(TestingBrowserProcess::GetGlobal()),
         window_id_(0),
         fake_user_manager_(new user_manager::FakeUserManager),
         user_manager_enabler_(fake_user_manager_) {}
@@ skipping 75 matching lines @@
     int result = state_changed_count_;
     state_changed_count_ = 0;
     return result;
   }
 
   bool ShouldShowNotificationAsPopup(
       const message_center::NotifierId& notifier_id,
       const std::string profile_id) {
     message_center::NotifierId id_with_profile = notifier_id;
     id_with_profile.profile_id = profile_id;
-    return blocker()->ShouldShowNotificationAsPopup(id_with_profile);
+
+    message_center::Notification notification(
+        message_center::NOTIFICATION_TYPE_SIMPLE, "popup-id",
+        UTF8ToUTF16("popup-title"), UTF8ToUTF16("popup-message"), gfx::Image(),
+        UTF8ToUTF16("popup-source"), GURL(), id_with_profile,
+        message_center::RichNotificationData(), NULL);
+
+    return blocker()->ShouldShowNotificationAsPopup(notification);
   }
 
   bool ShouldShowNotification(
       const message_center::NotifierId& notifier_id,
       const std::string profile_id) {
     message_center::NotifierId id_with_profile = notifier_id;
     id_with_profile.profile_id = profile_id;
-    return blocker()->ShouldShowNotification(id_with_profile);
+
+    message_center::Notification notification(
+        message_center::NOTIFICATION_TYPE_SIMPLE, "notification-id",
+        UTF8ToUTF16("notification-title"), UTF8ToUTF16("notification-message"),
+        gfx::Image(), UTF8ToUTF16("notification-source"), GURL(),
+        id_with_profile, message_center::RichNotificationData(), NULL);
+
+    return blocker()->ShouldShowNotification(notification);
   }
 
   aura::Window* CreateWindowForProfile(const std::string& name) {
     aura::Window* window = CreateTestWindowInShellWithId(window_id_++);
     chrome::MultiUserWindowManager::GetInstance()->SetWindowOwner(
         window, AccountId::FromUserEmail(name));
     return window;
   }
 
  private:
@@ skipping 87 matching lines @@
   EXPECT_FALSE(ShouldShowNotification(notifier_id, ""));
   EXPECT_TRUE(ShouldShowNotification(ash_system_notifier, ""));
   EXPECT_FALSE(ShouldShowNotification(random_system_notifier, ""));
   EXPECT_TRUE(ShouldShowNotification(notifier_id, GetDefaultUserId()));
   EXPECT_FALSE(ShouldShowNotification(notifier_id, "test2@example.com"));
   EXPECT_TRUE(ShouldShowNotification(random_system_notifier,
                                      GetDefaultUserId()));
   EXPECT_FALSE(ShouldShowNotification(random_system_notifier,
                                       "test2@example.com"));
 }