Adds a small icon to notifications, and connects it to synced notifications.

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/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 47 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MockMessageCenter);
 };
 
 }  // namespace
 
 @implementation MCNotificationController (TestingInterface)
 - (NSButton*)closeButton {
   return closeButton_.get();
 }
 
+- (NSImageView*)smallImageView {
+  return smallImage_.get();
+}
+
 - (NSButton*)secondButton {
   // The buttons are in Cocoa-y-order, so the 2nd button is first.
   NSView* view = [[bottomView_ subviews] objectAtIndex:0];
   return base::mac::ObjCCastStrict<NSButton>(view);
 }
 
 - (NSArray*)bottomSubviews {
   return [bottomView_ subviews];
 }
 
@@ skipping 37 matching lines @@
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_SIMPLE,
           "",
           ASCIIToUTF16("Added to circles"),
           ASCIIToUTF16("Jonathan and 5 others"),
           gfx::Image(),
           base::string16(),
           DummyNotifierId(),
           message_center::RichNotificationData(),
           NULL));
-  notification->set_icon(gfx::Image([TestIcon() retain]));
+  gfx::Image testIcon([TestIcon() retain]);
+  notification->set_icon(testIcon);
+  notification->set_small_image(testIcon);
 
   base::scoped_nsobject<MCNotificationController> controller(
       [[MCNotificationController alloc] initWithNotification:notification.get()
                                                messageCenter:NULL]);
   [controller view];
 
   EXPECT_EQ(TestIcon(), [[controller iconView] image]);
+  EXPECT_EQ(TestIcon(), [[controller smallImageView] image]);
   EXPECT_EQ(base::SysNSStringToUTF16([[controller titleView] string]),
             notification->title());
   EXPECT_EQ(base::SysNSStringToUTF16([[controller messageView] string]),
             notification->message());
   EXPECT_EQ(controller.get(), [[controller closeButton] target]);
 }
 
 TEST_F(NotificationControllerTest, OverflowText) {
   scoped_ptr<message_center::Notification> notification(
       new message_center::Notification(
@@ skipping 59 matching lines @@
           NULL));
   base::scoped_nsobject<MCNotificationController> controller(
       [[MCNotificationController alloc] initWithNotification:notification.get()
                                                messageCenter:NULL]);
 
   // Set up the default layout.
   [controller view];
   EXPECT_EQ(NSHeight([[controller view] frame]),
             message_center::kNotificationIconSize);
   EXPECT_FALSE([[controller iconView] image]);
+  EXPECT_FALSE([[controller smallImageView] image]);
 
   // Update the icon.
-  notification->set_icon(gfx::Image([TestIcon() retain]));
+  gfx::Image testIcon([TestIcon() retain]);
+  notification->set_icon(testIcon);
+  notification->set_small_image(testIcon);
   [controller updateNotification:notification.get()];
   EXPECT_EQ(TestIcon(), [[controller iconView] image]);
+  EXPECT_EQ(TestIcon(), [[controller smallImageView] image]);
   EXPECT_EQ(NSHeight([[controller view] frame]),
             message_center::kNotificationIconSize);
 }
 
 TEST_F(NotificationControllerTest, Buttons) {
   message_center::RichNotificationData optional;
   message_center::ButtonInfo button1(UTF8ToUTF16("button1"));
   optional.buttons.push_back(button1);
   message_center::ButtonInfo button2(UTF8ToUTF16("button2"));
   optional.buttons.push_back(button2);
@@ skipping 87 matching lines @@
   EXPECT_FALSE([[controller titleView] isHidden]);
   EXPECT_TRUE([[controller messageView] isHidden]);
   EXPECT_FALSE([[controller contextMessageView] isHidden]);
 
   EXPECT_EQ(3u, [[[controller listView] subviews] count]);
   EXPECT_LT(NSMaxY([[controller listView] frame]),
             NSMinY([[controller titleView] frame]));
 }
 
 }  // namespace message_center