Elide origins displayed on web 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 99 matching lines @@
 
  protected:
   message_center::NotifierId DummyNotifierId() {
     return message_center::NotifierId();
   }
 };
 
 TEST_F(NotificationControllerTest, BasicLayout) {
   scoped_ptr<message_center::Notification> notification(
       new message_center::Notification(
-          message_center::NOTIFICATION_TYPE_SIMPLE,
-          "",
+          message_center::NOTIFICATION_TYPE_SIMPLE, "",
           ASCIIToUTF16("Added to circles"),
-          ASCIIToUTF16("Jonathan and 5 others"),
-          gfx::Image(),
-          base::string16(),
-          DummyNotifierId(),
-          message_center::RichNotificationData(),
+          ASCIIToUTF16("Jonathan and 5 others"), gfx::Image(), base::string16(),
+          GURL(), DummyNotifierId(), message_center::RichNotificationData(),
           NULL));
   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(
-          message_center::NOTIFICATION_TYPE_SIMPLE,
-          "",
+          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(),
-          base::string16(),
-          DummyNotifierId(),
-          message_center::RichNotificationData(),
-          NULL));
+          gfx::Image(), base::string16(), GURL(), DummyNotifierId(),
+          message_center::RichNotificationData(), NULL));
   base::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",
-          base::string16(),
-          base::string16(),
-          gfx::Image(),
-          base::string16(),
-          DummyNotifierId(),
-          message_center::RichNotificationData(),
-          NULL));
+          message_center::NOTIFICATION_TYPE_SIMPLE, "an_id", base::string16(),
+          base::string16(), gfx::Image(), base::string16(), GURL(),
+          DummyNotifierId(), message_center::RichNotificationData(), NULL));
   MockMessageCenter message_center;
 
   base::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,
-          "",
+          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(),
-          base::string16(),
-          DummyNotifierId(),
-          message_center::RichNotificationData(),
-          NULL));
+          gfx::Image(), base::string16(), GURL(), DummyNotifierId(),
+          message_center::RichNotificationData(), 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]);
@@ skipping 11 matching lines @@
 
 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);
 
   scoped_ptr<message_center::Notification> notification(
       new message_center::Notification(
-          message_center::NOTIFICATION_TYPE_BASE_FORMAT,
-          "an_id",
-          base::string16(),
-          base::string16(),
-          gfx::Image(),
-          base::string16(),
-          DummyNotifierId(),
-          optional,
-          NULL));
+          message_center::NOTIFICATION_TYPE_BASE_FORMAT, "an_id",
+          base::string16(), base::string16(), gfx::Image(), base::string16(),
+          GURL(), DummyNotifierId(), optional, NULL));
   MockMessageCenter message_center;
 
   base::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",
-          base::string16(),
-          base::string16(),
-          gfx::Image(),
-          base::string16(),
-          DummyNotifierId(),
-          message_center::RichNotificationData(),
+          message_center::NOTIFICATION_TYPE_BASE_FORMAT, "an_id",
+          base::string16(), base::string16(), gfx::Image(), base::string16(),
+          GURL(), DummyNotifierId(), message_center::RichNotificationData(),
           NULL));
   NSImage* image = [NSImage imageNamed:NSImageNameFolder];
   notification->set_image(gfx::Image([image retain]));
 
   MockMessageCenter message_center;
 
   base::scoped_nsobject<MCNotificationController> controller(
       [[MCNotificationController alloc] initWithNotification:notification.get()
                                                messageCenter:&message_center]);
   [controller view];
@@ skipping 11 matching lines @@
       UTF8ToUTF16("First title"), UTF8ToUTF16("first message"));
   optional.items.push_back(item1);
   message_center::NotificationItem item2(
       UTF8ToUTF16("Second title"),
       UTF8ToUTF16("second slightly longer message"));
   optional.items.push_back(item2);
   message_center::NotificationItem item3(
       UTF8ToUTF16(""),    // Test for empty string.
       UTF8ToUTF16(" "));  // Test for string containing only spaces.
   optional.items.push_back(item3);
-  optional.context_message = UTF8ToUTF16("Context Message");
+  optional.context_message.message = UTF8ToUTF16("Context Message");
+  optional.context_message.use_origin_as_context = false;
 
   scoped_ptr<message_center::Notification> notification(
       new message_center::Notification(
-          message_center::NOTIFICATION_TYPE_BASE_FORMAT,
-          "an_id",
+          message_center::NOTIFICATION_TYPE_BASE_FORMAT, "an_id",
           UTF8ToUTF16("Notification Title"),
-          UTF8ToUTF16("Notification Message - should be hidden"),
-          gfx::Image(),
-          base::string16(),
-          DummyNotifierId(),
-          optional,
-          NULL));
+          UTF8ToUTF16("Notification Message - should be hidden"), gfx::Image(),
+          base::string16(), GURL(), DummyNotifierId(), optional, NULL));
 
   MockMessageCenter message_center;
   base::scoped_nsobject<MCNotificationController> controller(
       [[MCNotificationController alloc] initWithNotification:notification.get()
                                                messageCenter:&message_center]);
   [controller view];
 
   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]));
 }
 
 TEST_F(NotificationControllerTest, NoMessage) {
   message_center::RichNotificationData optional;
-  optional.context_message = UTF8ToUTF16("Context Message");
+  optional.context_message.message = UTF8ToUTF16("Context Message");
+  optional.context_message.use_origin_as_context = false;
 
   scoped_ptr<message_center::Notification> notification(
       new message_center::Notification(
-          message_center::NOTIFICATION_TYPE_BASE_FORMAT,
-          "an_id",
-          UTF8ToUTF16("Notification Title"),
-          UTF8ToUTF16(""),
-          gfx::Image(),
-          base::string16(),
-          DummyNotifierId(),
-          optional,
-          NULL));
+          message_center::NOTIFICATION_TYPE_BASE_FORMAT, "an_id",
+          UTF8ToUTF16("Notification Title"), UTF8ToUTF16(""), gfx::Image(),
+          base::string16(), GURL(), DummyNotifierId(), optional, NULL));
 
   MockMessageCenter message_center;
   base::scoped_nsobject<MCNotificationController> controller(
       [[MCNotificationController alloc] initWithNotification:notification.get()
                                                messageCenter:&message_center]);
   [controller view];
 
   EXPECT_FALSE([[controller titleView] isHidden]);
   EXPECT_TRUE([[controller messageView] isHidden]);
   EXPECT_FALSE([[controller contextMessageView] isHidden]);
 }
 
 TEST_F(NotificationControllerTest, MessageSize) {
   message_center::RichNotificationData data;
   std::string id("id");
   NotifierId notifier_id(NotifierId::APPLICATION, "notifier");
   scoped_ptr<Notification> notification(new Notification(
-      NOTIFICATION_TYPE_BASE_FORMAT,
-      id,
-      base::UTF8ToUTF16(""),
+      NOTIFICATION_TYPE_BASE_FORMAT, id, base::UTF8ToUTF16(""),
       ASCIIToUTF16("And\neven\nthe\nmessage is long.\nThis sure is wordy"),
-      gfx::Image(),
-      base::string16() /* display_source */,
-      notifier_id,
-      data,
-      NULL /* delegate */));
+      gfx::Image(), base::string16() /* display_source */, GURL(), notifier_id,
+      data, NULL /* delegate */));
 
   base::scoped_nsobject<MCNotificationController> controller(
       [[MCNotificationController alloc] initWithNotification:notification.get()
                                                messageCenter:NULL]);
 
   // Set up the default layout.
   [controller view];
 
   auto compute_message_lines = ^{
       NSString* string = [[[controller messageView] textStorage] string];
@@ skipping 30 matching lines @@
   notification->set_title(ASCIIToUTF16("one line"));
   [controller updateNotification:notification.get()];
   EXPECT_EQ(2u, compute_message_lines());
 
   // Message, image and two line title: 1 lines.
   notification->set_title(ASCIIToUTF16("two\nlines"));
   [controller updateNotification:notification.get()];
   EXPECT_EQ(1u, compute_message_lines());
 
   // Same as above, but context message takes away from message lines.
-  notification->set_context_message(base::UTF8ToUTF16("foo"));
+  notification->set_context_message(UTF8ToUTF16("foo"), false);
   notification->set_title(ASCIIToUTF16(""));
   [controller updateNotification:notification.get()];
   EXPECT_EQ(1u, compute_message_lines());
 
   notification->set_title(ASCIIToUTF16("one line"));
   [controller updateNotification:notification.get()];
   EXPECT_EQ(1u, compute_message_lines());
 
   notification->set_title(ASCIIToUTF16("two\nlines"));
   [controller updateNotification:notification.get()];
   EXPECT_EQ(0u, compute_message_lines());
 }
 
 }  // namespace message_center