Enable users of NotificationUIManager to specify binary images.

ui/message_center/cocoa/tray_view_controller_unittest.mm

 // Copyright (c) 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.
 
 #import "ui/message_center/cocoa/tray_view_controller.h"
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/utf_string_conversions.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 #include "ui/message_center/message_center.h"
@@ skipping 18 matching lines @@
 
  protected:
   message_center::MessageCenter* center_;  // Weak, global.
 
   scoped_nsobject<MCTrayViewController> tray_;
 };
 
 TEST_F(TrayViewControllerTest, AddRemoveOne) {
   NSScrollView* view = [[tray_ scrollView] documentView];
   EXPECT_EQ(0u, [[view subviews] count]);
-  center_->AddNotification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                           "1",
-                           ASCIIToUTF16("First notification"),
-                           ASCIIToUTF16("This is a simple test."),
-                           string16(),
-                           std::string(),
-                           NULL,
-                           NULL);
+  scoped_ptr<message_center::Notification> notification_data;
+  notification_data.reset(new message_center::Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE,
+      "1",
+      ASCIIToUTF16("First notification"),
+      ASCIIToUTF16("This is a simple test."),
+      gfx::Image(),
+      string16(),
+      std::string(),
+      NULL,
+      NULL));
+  center_->AddNotification(notification_data.Pass());
   [tray_ onMessageCenterTrayChanged];
   ASSERT_EQ(1u, [[view subviews] count]);
 
   // The view should have padding around it.
   NSView* notification = [[view subviews] objectAtIndex:0];
   NSRect notification_frame = [notification frame];
   EXPECT_CGFLOAT_EQ(2 * message_center::kMarginBetweenItems,
                     NSHeight([view frame]) - NSHeight(notification_frame));
   EXPECT_CGFLOAT_EQ(2 * message_center::kMarginBetweenItems,
                     NSWidth([view frame]) - NSWidth(notification_frame));
   EXPECT_GT(NSHeight([[tray_ view] frame]),
             NSHeight([[tray_ scrollView] frame]));
 
   center_->RemoveNotification("1", true);
   [tray_ onMessageCenterTrayChanged];
   EXPECT_EQ(0u, [[view subviews] count]);
   EXPECT_CGFLOAT_EQ(0, NSHeight([view frame]));
 }
 
 TEST_F(TrayViewControllerTest, AddThreeClearAll) {
   NSScrollView* view = [[tray_ scrollView] documentView];
   EXPECT_EQ(0u, [[view subviews] count]);
-  center_->AddNotification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                           "1",
-                           ASCIIToUTF16("First notification"),
-                           ASCIIToUTF16("This is a simple test."),
-                           string16(),
-                           std::string(),
-                           NULL,
-                           NULL);
-  center_->AddNotification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                           "2",
-                           ASCIIToUTF16("Second notification"),
-                           ASCIIToUTF16("This is a simple test."),
-                           string16(),
-                           std::string(),
-                           NULL,
-                           NULL);
-  center_->AddNotification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                           "3",
-                           ASCIIToUTF16("Third notification"),
-                           ASCIIToUTF16("This is a simple test."),
-                           string16(),
-                           std::string(),
-                           NULL,
-                           NULL);
+  scoped_ptr<message_center::Notification> notification;
+  notification.reset(new message_center::Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE,
+      "1",
+      ASCIIToUTF16("First notification"),
+      ASCIIToUTF16("This is a simple test."),
+      gfx::Image(),
+      string16(),
+      std::string(),
+      NULL,
+      NULL));
+  center_->AddNotification(notification.Pass());
+  notification.reset(new message_center::Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE,
+      "2",
+      ASCIIToUTF16("Second notification"),
+      ASCIIToUTF16("This is a simple test."),
+      gfx::Image(),
+      string16(),
+      std::string(),
+      NULL,
+      NULL));
+  center_->AddNotification(notification.Pass());
+  notification.reset(new message_center::Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE,
+      "3",
+      ASCIIToUTF16("Third notification"),
+      ASCIIToUTF16("This is a simple test."),
+      gfx::Image(),
+      string16(),
+      std::string(),
+      NULL,
+      NULL));
+  center_->AddNotification(notification.Pass());
   [tray_ onMessageCenterTrayChanged];
   ASSERT_EQ(3u, [[view subviews] count]);
 
   [tray_ clearAllNotifications:nil];
   [tray_ onMessageCenterTrayChanged];
 
   EXPECT_EQ(0u, [[view subviews] count]);
   EXPECT_CGFLOAT_EQ(0, NSHeight([view frame]));
 }
 
 TEST_F(TrayViewControllerTest, NoClearAllWhenNoNotifications) {
   EXPECT_TRUE([tray_ pauseButton]);
   EXPECT_TRUE([tray_ clearAllButton]);
 
   // With no notifications, the clear all button should be hidden.
   EXPECT_TRUE([[tray_ clearAllButton] isHidden]);
   EXPECT_LT(NSMinX([[tray_ clearAllButton] frame]),
             NSMinX([[tray_ pauseButton] frame]));
 
   // Add a notification.
-  center_->AddNotification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                           "1",
-                           ASCIIToUTF16("First notification"),
-                           ASCIIToUTF16("This is a simple test."),
-                           string16(),
-                           std::string(),
-                           NULL,
-                           NULL);
+  scoped_ptr<message_center::Notification> notification;
+  notification.reset(new message_center::Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE,
+      "1",
+      ASCIIToUTF16("First notification"),
+      ASCIIToUTF16("This is a simple test."),
+      gfx::Image(),
+      string16(),
+      std::string(),
+      NULL,
+      NULL));
+  center_->AddNotification(notification.Pass());
   [tray_ onMessageCenterTrayChanged];
 
   // Clear all should now be visible.
   EXPECT_FALSE([[tray_ clearAllButton] isHidden]);
   EXPECT_GT(NSMinX([[tray_ clearAllButton] frame]),
             NSMinX([[tray_ pauseButton] frame]));
 
   // Adding a second notification should keep things still visible.
-  center_->AddNotification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                           "2",
-                           ASCIIToUTF16("Second notification"),
-                           ASCIIToUTF16("This is a simple test."),
-                           string16(),
-                           std::string(),
-                           NULL,
-                           NULL);
+  notification.reset(new message_center::Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE,
+      "2",
+      ASCIIToUTF16("Second notification"),
+      ASCIIToUTF16("This is a simple test."),
+      gfx::Image(),
+      string16(),
+      std::string(),
+      NULL,
+      NULL));
+  center_->AddNotification(notification.Pass());
   [tray_ onMessageCenterTrayChanged];
   EXPECT_FALSE([[tray_ clearAllButton] isHidden]);
   EXPECT_GT(NSMinX([[tray_ clearAllButton] frame]),
             NSMinX([[tray_ pauseButton] frame]));
 
   // Clear all notifications.
   [tray_ clearAllNotifications:nil];
   [tray_ onMessageCenterTrayChanged];
 
   // The button should be hidden again.
   EXPECT_TRUE([[tray_ clearAllButton] isHidden]);
   EXPECT_LT(NSMinX([[tray_ clearAllButton] frame]),
             NSMinX([[tray_ pauseButton] frame]));
 }