Pass Notification into NotificationBlocker ShouldShow* methods

chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.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 "ash/common/system/system_notifier.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/macros.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/notifications/login_state_notification_blocker_chromeos.h"
 #include "content/public/test/test_utils.h"
 #include "ui/message_center/message_center.h"
 
+using base::UTF8ToUTF16;
 using namespace testing;
 
 namespace {
 
 const char* kTestUsers[] = {"test-user@gmail.com",
                             "test-user1@gmail.com"};
 
 class UserAddingFinishObserver : public chromeos::UserAddingScreen::Observer {
  public:
   UserAddingFinishObserver() {
@@ skipping 63 matching lines @@
   }
 
   int GetStateChangedCountAndReset() {
     int result = state_changed_count_;
     state_changed_count_ = 0;
     return result;
   }
 
   bool ShouldShowNotificationAsPopup(
       const message_center::NotifierId& notifier_id) {
-    return blocker_->ShouldShowNotificationAsPopup(notifier_id);
+    message_center::Notification notification(
+        message_center::NOTIFICATION_TYPE_SIMPLE, "browser-id",
+        UTF8ToUTF16("browser-title"), UTF8ToUTF16("browser-message"),
+        gfx::Image(), UTF8ToUTF16("browser-source"), GURL(),
+        notifier_id, message_center::RichNotificationData(), NULL);
+    return blocker_->ShouldShowNotificationAsPopup(notification);
   }
 
  private:
   int state_changed_count_;
   std::unique_ptr<message_center::NotificationBlocker> blocker_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginStateNotificationBlockerChromeOSBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(LoginStateNotificationBlockerChromeOSBrowserTest,
@@ skipping 57 matching lines @@
   EXPECT_EQ(1, GetStateChangedCountAndReset());
   EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id));
 
   // Multi-login user switch off.
   chromeos::UserAddingScreen::Get()->Cancel();
   observer.WaitUntilUserAddingFinishedOrCancelled();
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(1, GetStateChangedCountAndReset());
   EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id));
 }