Enable users of NotificationUIManager to specify binary images.

ui/message_center/cocoa/notification_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/notification_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 85 matching lines @@
   }
 };
 
 TEST_F(NotificationControllerTest, BasicLayout) {
   scoped_ptr<message_center::Notification> notification(
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_SIMPLE,
           "",
           ASCIIToUTF16("Added to circles"),
           ASCIIToUTF16("Jonathan and 5 others"),
+          gfx::Image(),
           string16(),
           std::string(),
           NULL,
           NULL));
   notification->set_icon(gfx::Image([TestIcon() retain]));
 
   scoped_nsobject<MCNotificationController> controller(
       [[MCNotificationController alloc] initWithNotification:notification.get()
                                                messageCenter:NULL]);
   [controller view];
 
   EXPECT_EQ(TestIcon(), [[controller iconView] image]);
   EXPECT_EQ(base::SysNSStringToUTF16([[controller titleView] stringValue]),
             notification->title());
   EXPECT_EQ(base::SysNSStringToUTF16([[controller messageView] stringValue]),
             notification->message());
   EXPECT_EQ(controller.get(), [[controller closeButton] target]);
 }
 
 TEST_F(NotificationControllerTest, OverflowText) {
   scoped_ptr<message_center::Notification> notification(
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_SIMPLE,
           "",
           ASCIIToUTF16("This is a much longer title that should wrap "
                        "multiple lines."),
           ASCIIToUTF16("And even the message is long. This sure is a wordy "
                        "notification. Are you really going to read this "
                        "entire thing?"),
+          gfx::Image(),
           string16(),
           std::string(),
           NULL,
           NULL));
   scoped_nsobject<MCNotificationController> controller(
       [[MCNotificationController alloc] initWithNotification:notification.get()
                                                messageCenter:NULL]);
   [controller view];
 
   EXPECT_GT(NSHeight([[controller view] frame]),
             message_center::kNotificationIconSize);
 }
 
 TEST_F(NotificationControllerTest, Close) {
   scoped_ptr<message_center::Notification> notification(
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_SIMPLE,
           "an_id",
           string16(),
           string16(),
+          gfx::Image(),
           string16(),
           std::string(),
           NULL,
           NULL));
   MockMessageCenter message_center;
 
   scoped_nsobject<MCNotificationController> controller(
       [[MCNotificationController alloc] initWithNotification:notification.get()
                                                messageCenter:&message_center]);
   [controller view];
 
   [[controller closeButton] performClick:nil];
 
   EXPECT_EQ(1, message_center.remove_count());
   EXPECT_EQ("an_id", message_center.last_removed_id());
   EXPECT_TRUE(message_center.last_removed_by_user());
 }
 
 TEST_F(NotificationControllerTest, Update) {
   scoped_ptr<message_center::Notification> notification(
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_SIMPLE,
           "",
           ASCIIToUTF16("A simple title"),
           ASCIIToUTF16("This message isn't too long and should fit in the"
                        "default bounds."),
+          gfx::Image(),
           string16(),
           std::string(),
           NULL,
           NULL));
   scoped_nsobject<MCNotificationController> controller(
       [[MCNotificationController alloc] initWithNotification:notification.get()
                                                messageCenter:NULL]);
 
   // Set up the default layout.
   [controller view];
@@ skipping 13 matching lines @@
   base::DictionaryValue buttons;
   buttons.SetString(message_center::kButtonOneTitleKey, "button1");
   buttons.SetString(message_center::kButtonTwoTitleKey, "button2");
 
   scoped_ptr<message_center::Notification> notification(
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_BASE_FORMAT,
           "an_id",
           string16(),
           string16(),
+          gfx::Image(),
           string16(),
           std::string(),
           &buttons,
           NULL));
   MockMessageCenter message_center;
 
   scoped_nsobject<MCNotificationController> controller(
       [[MCNotificationController alloc] initWithNotification:notification.get()
                                                messageCenter:&message_center]);
   [controller view];
 
   [[controller secondButton] performClick:nil];
 
   EXPECT_EQ("an_id", message_center.last_clicked_id());
   EXPECT_EQ(1, message_center.last_clicked_index());
 }
 
 TEST_F(NotificationControllerTest, Image) {
   scoped_ptr<message_center::Notification> notification(
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_BASE_FORMAT,
           "an_id",
           string16(),
           string16(),
+          gfx::Image(),
           string16(),
           std::string(),
           NULL,
           NULL));
   NSImage* image = [NSImage imageNamed:NSImageNameFolder];
   notification->set_image(gfx::Image([image retain]));
 
   MockMessageCenter message_center;
 
   scoped_nsobject<MCNotificationController> controller(
@@ skipping 23 matching lines @@
 
   base::DictionaryValue items;
   items.Set(message_center::kItemsKey, list);
 
   scoped_ptr<message_center::Notification> notification(
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_BASE_FORMAT,
           "an_id",
           string16(),
           string16(),
+          gfx::Image(),
           string16(),
           std::string(),
           &items,
           NULL));
 
   MockMessageCenter message_center;
   scoped_nsobject<MCNotificationController> controller(
       [[MCNotificationController alloc] initWithNotification:notification.get()
                                                messageCenter:&message_center]);
   [controller view];
 
   EXPECT_EQ(2u, [[[controller listItemView] subviews] count]);
   EXPECT_TRUE(NSMaxY([[controller listItemView] frame]) <
               NSMinY([[controller messageView] frame]));
 }