Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1011)

Unified Diff: ui/message_center/cocoa/tray_view_controller_unittest.mm

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/message_center/cocoa/settings_controller.mm ('k') | ui/message_center/notification.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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));
« no previous file with comments | « ui/message_center/cocoa/settings_controller.mm ('k') | ui/message_center/notification.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698