| Index: ui/message_center/cocoa/tray_view_controller_unittest.mm
|
| diff --git a/ui/message_center/cocoa/tray_view_controller_unittest.mm b/ui/message_center/cocoa/tray_view_controller_unittest.mm
|
| index cb649f9bdf65d03755b2a0427e57fdc6e5b9e999..fe2399dada576c44744a28a0cbf168bd997379a8 100644
|
| --- a/ui/message_center/cocoa/tray_view_controller_unittest.mm
|
| +++ b/ui/message_center/cocoa/tray_view_controller_unittest.mm
|
| @@ -76,7 +76,7 @@ TEST_F(TrayViewControllerTest, AddRemoveOne) {
|
| ASCIIToUTF16("First notification"),
|
| ASCIIToUTF16("This is a simple test."),
|
| gfx::Image(),
|
| - string16(),
|
| + base::string16(),
|
| DummyNotifierId(),
|
| message_center::RichNotificationData(),
|
| NULL));
|
| @@ -110,7 +110,7 @@ TEST_F(TrayViewControllerTest, AddThreeClearAll) {
|
| ASCIIToUTF16("First notification"),
|
| ASCIIToUTF16("This is a simple test."),
|
| gfx::Image(),
|
| - string16(),
|
| + base::string16(),
|
| DummyNotifierId(),
|
| message_center::RichNotificationData(),
|
| NULL));
|
| @@ -121,7 +121,7 @@ TEST_F(TrayViewControllerTest, AddThreeClearAll) {
|
| ASCIIToUTF16("Second notification"),
|
| ASCIIToUTF16("This is a simple test."),
|
| gfx::Image(),
|
| - string16(),
|
| + base::string16(),
|
| DummyNotifierId(),
|
| message_center::RichNotificationData(),
|
| NULL));
|
| @@ -132,7 +132,7 @@ TEST_F(TrayViewControllerTest, AddThreeClearAll) {
|
| ASCIIToUTF16("Third notification"),
|
| ASCIIToUTF16("This is a simple test."),
|
| gfx::Image(),
|
| - string16(),
|
| + base::string16(),
|
| DummyNotifierId(),
|
| message_center::RichNotificationData(),
|
| NULL));
|
| @@ -165,7 +165,7 @@ TEST_F(TrayViewControllerTest, NoClearAllWhenNoNotifications) {
|
| ASCIIToUTF16("First notification"),
|
| ASCIIToUTF16("This is a simple test."),
|
| gfx::Image(),
|
| - string16(),
|
| + base::string16(),
|
| DummyNotifierId(),
|
| message_center::RichNotificationData(),
|
| NULL));
|
| @@ -184,7 +184,7 @@ TEST_F(TrayViewControllerTest, NoClearAllWhenNoNotifications) {
|
| ASCIIToUTF16("Second notification"),
|
| ASCIIToUTF16("This is a simple test."),
|
| gfx::Image(),
|
| - string16(),
|
| + base::string16(),
|
| DummyNotifierId(),
|
| message_center::RichNotificationData(),
|
| NULL));
|
|
|