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

Unified Diff: ui/message_center/cocoa/notification_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
Index: ui/message_center/cocoa/notification_controller_unittest.mm
diff --git a/ui/message_center/cocoa/notification_controller_unittest.mm b/ui/message_center/cocoa/notification_controller_unittest.mm
index 7b4d23551fb4a555591cf3458d2046e710dd1c6f..57726abdb65763e08be4a98752e5d22bdeef881c 100644
--- a/ui/message_center/cocoa/notification_controller_unittest.mm
+++ b/ui/message_center/cocoa/notification_controller_unittest.mm
@@ -115,7 +115,7 @@ TEST_F(NotificationControllerTest, BasicLayout) {
ASCIIToUTF16("Added to circles"),
ASCIIToUTF16("Jonathan and 5 others"),
gfx::Image(),
- string16(),
+ base::string16(),
DummyNotifierId(),
message_center::RichNotificationData(),
NULL));
@@ -145,7 +145,7 @@ TEST_F(NotificationControllerTest, OverflowText) {
"notification. Are you really going to read this "
"entire thing?"),
gfx::Image(),
- string16(),
+ base::string16(),
DummyNotifierId(),
message_center::RichNotificationData(),
NULL));
@@ -163,10 +163,10 @@ TEST_F(NotificationControllerTest, Close) {
new message_center::Notification(
message_center::NOTIFICATION_TYPE_SIMPLE,
"an_id",
- string16(),
- string16(),
+ base::string16(),
+ base::string16(),
gfx::Image(),
- string16(),
+ base::string16(),
DummyNotifierId(),
message_center::RichNotificationData(),
NULL));
@@ -193,7 +193,7 @@ TEST_F(NotificationControllerTest, Update) {
ASCIIToUTF16("This message isn't too long and should fit in the"
"default bounds."),
gfx::Image(),
- string16(),
+ base::string16(),
DummyNotifierId(),
message_center::RichNotificationData(),
NULL));
@@ -226,10 +226,10 @@ TEST_F(NotificationControllerTest, Buttons) {
new message_center::Notification(
message_center::NOTIFICATION_TYPE_BASE_FORMAT,
"an_id",
- string16(),
- string16(),
+ base::string16(),
+ base::string16(),
gfx::Image(),
- string16(),
+ base::string16(),
DummyNotifierId(),
optional,
NULL));
@@ -251,10 +251,10 @@ TEST_F(NotificationControllerTest, Image) {
new message_center::Notification(
message_center::NOTIFICATION_TYPE_BASE_FORMAT,
"an_id",
- string16(),
- string16(),
+ base::string16(),
+ base::string16(),
gfx::Image(),
- string16(),
+ base::string16(),
DummyNotifierId(),
message_center::RichNotificationData(),
NULL));
@@ -297,7 +297,7 @@ TEST_F(NotificationControllerTest, List) {
UTF8ToUTF16("Notification Title"),
UTF8ToUTF16("Notification Message - should be hidden"),
gfx::Image(),
- string16(),
+ base::string16(),
DummyNotifierId(),
optional,
NULL));
« no previous file with comments | « ui/message_center/cocoa/notification_controller.mm ('k') | ui/message_center/cocoa/popup_collection_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698