| Index: ui/message_center/cocoa/popup_collection_unittest.mm
|
| diff --git a/ui/message_center/cocoa/popup_collection_unittest.mm b/ui/message_center/cocoa/popup_collection_unittest.mm
|
| index 8b1bf6b7bec2fbf323d80934df79488683aa6149..6a5a2a1acb44427d0b9eb5db5ddf6f67e0e2c40c 100644
|
| --- a/ui/message_center/cocoa/popup_collection_unittest.mm
|
| +++ b/ui/message_center/cocoa/popup_collection_unittest.mm
|
| @@ -47,6 +47,7 @@ class PopupCollectionTest : public ui::CocoaTest {
|
| " be displayed"),
|
| string16(),
|
| std::string(),
|
| + NULL,
|
| NULL);
|
| center_->AddNotification(message_center::NOTIFICATION_TYPE_SIMPLE,
|
| "2",
|
| @@ -54,6 +55,7 @@ class PopupCollectionTest : public ui::CocoaTest {
|
| ASCIIToUTF16("This is the second notification."),
|
| string16(),
|
| std::string(),
|
| + NULL,
|
| NULL);
|
| center_->AddNotification(message_center::NOTIFICATION_TYPE_SIMPLE,
|
| "3",
|
| @@ -65,6 +67,7 @@ class PopupCollectionTest : public ui::CocoaTest {
|
| "set the screen size too small."),
|
| string16(),
|
| std::string(),
|
| + NULL,
|
| NULL);
|
| }
|
|
|
| @@ -102,6 +105,7 @@ TEST_F(PopupCollectionTest, AttemptFourOneOffscreen) {
|
| ASCIIToUTF16("This is the fourth notification."),
|
| string16(),
|
| std::string(),
|
| + NULL,
|
| NULL);
|
|
|
| // Remove "1" and "4" should fit on screen.
|
| @@ -144,7 +148,8 @@ TEST_F(PopupCollectionTest, LayoutSpacing) {
|
| ASCIIToUTF16("This is the fourth notification."),
|
| string16(),
|
| std::string(),
|
| - optional.get());
|
| + optional.get(),
|
| + NULL);
|
| EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:2],
|
| [popups objectAtIndex:3]));
|
|
|
| @@ -174,6 +179,7 @@ TEST_F(PopupCollectionTest, TinyScreen) {
|
| " be displayed"),
|
| string16(),
|
| std::string(),
|
| + NULL,
|
| NULL);
|
| EXPECT_EQ(1u, [[collection_ popups] count]);
|
|
|
| @@ -226,6 +232,7 @@ TEST_F(PopupCollectionTest, UpdateIconAndBody) {
|
| "longer body"),
|
| string16(),
|
| std::string(),
|
| + NULL,
|
| NULL);
|
| EXPECT_GT(NSHeight([[controller view] frame]), NSHeight(old_frame));
|
|
|
|
|