1 files changed, 12 insertions, 11 deletions
diff --git a/chromium/ui/message_center/cocoa/popup_collection_unittest.mm b/chromium/ui/message_center/cocoa/popup_collection_unittest.mm
index 105c824e875..3ec7c3318f2 100644
--- a/chromium/ui/message_center/cocoa/popup_collection_unittest.mm
+++ b/chromium/ui/message_center/cocoa/popup_collection_unittest.mm
@@ -51,7 +51,7 @@ class PopupCollectionTest : public ui::CocoaTest {
                      " be displayed"),
         gfx::Image(),
         string16(),
-        std::string(),
+        message_center::NotifierId(),
         message_center::RichNotificationData(),
         NULL));
     center_->AddNotification(notification.Pass());
@@ -63,7 +63,7 @@ class PopupCollectionTest : public ui::CocoaTest {
         ASCIIToUTF16("This is the second notification."),
         gfx::Image(),
         string16(),
-        std::string(),
+        message_center::NotifierId(),
         message_center::RichNotificationData(),
         NULL));
     center_->AddNotification(notification.Pass());
@@ -76,10 +76,11 @@ class PopupCollectionTest : public ui::CocoaTest {
                      "that has a much longer body "
                      "than the other notifications. It "
                      "may not fit on the screen if we "
-                     "set the screen size too small."),
+                     "set the screen size too small or "
+                     "if the notification is way too big"),
         gfx::Image(),
         string16(),
-        std::string(),
+        message_center::NotifierId(),
         message_center::RichNotificationData(),
         NULL));
     center_->AddNotification(notification.Pass());
@@ -134,7 +135,7 @@ TEST_F(PopupCollectionTest, AttemptFourOneOffscreen) {
       ASCIIToUTF16("This is the fourth notification."),
       gfx::Image(),
       string16(),
-      std::string(),
+      message_center::NotifierId(),
       message_center::RichNotificationData(),
       NULL));
   center_->AddNotification(notification.Pass());
@@ -183,7 +184,7 @@ TEST_F(PopupCollectionTest, LayoutSpacing) {
       ASCIIToUTF16("This is the fourth notification."),
       gfx::Image(),
       string16(),
-      std::string(),
+      message_center::NotifierId(),
       optional,
       NULL));
   center_->AddNotification(notification.Pass());
@@ -221,7 +222,7 @@ TEST_F(PopupCollectionTest, TinyScreen) {
               " be displayed"),
       gfx::Image(),
       string16(),
-      std::string(),
+      message_center::NotifierId(),
       message_center::RichNotificationData(),
       NULL));
   center_->AddNotification(notification.Pass());
@@ -243,7 +244,7 @@ TEST_F(PopupCollectionTest, TinyScreen) {
               "long notification."),
       gfx::Image(),
       string16(),
-      std::string(),
+      message_center::NotifierId(),
       message_center::RichNotificationData(),
       NULL));
   center_->UpdateNotification("1", notification.Pass());
@@ -287,7 +288,7 @@ TEST_F(PopupCollectionTest, UpdateIconAndBody) {
               "longer body"),
       gfx::Image(),
       string16(),
-      std::string(),
+      message_center::NotifierId(),
       message_center::RichNotificationData(),
       NULL));
   center_->AddNotification(notification.Pass());
@@ -316,7 +317,7 @@ TEST_F(PopupCollectionTest, CloseCollectionBeforeNewPopupAnimationEnds) {
                    " be displayed"),
       gfx::Image(),
       string16(),
-      std::string(),
+      message_center::NotifierId(),
       message_center::RichNotificationData(),
       NULL));
   center_->AddNotification(notification.Pass());
@@ -349,7 +350,7 @@ TEST_F(PopupCollectionTest, CloseCollectionBeforeUpdatePopupAnimationEnds) {
       ASCIIToUTF16("New message."),
       gfx::Image(),
       string16(),
-      std::string(),
+      message_center::NotifierId(),
       message_center::RichNotificationData(),
       NULL));
   center_->UpdateNotification("1", notification.Pass());